* commit '70a2302c':
  Meatball actually finishes now
  Responds to both WSAD and arrow keys when WSAD is selected (but need prefabs for alternative controls), songs play at 0.8 speed and notes (roughly) match, Meatball needs tested for difficulty
  Added QWER/WSAD toggle and Meatball is now a selectable song
  Finished (but not tested) Meatball

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml

Responds to both WSAD and arrow keys when WSAD is selected (but need prefabs for alternative controls), songs play at 0.8 speed and notes (roughly) match, Meatball needs tested for difficulty

# Conflicts:
#	RingMaster/RingMaster/Assets/Resources/Meatball.txt.meta

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Added an animation for pie throwing.

enabled pause menu in mime, player can press 1234 to progress dialogue, player gets lots of pies in tutorial

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  fixed some art, john smith and mime mime W