* piethrowing:
  Simon's dialogue done
  Added boing to Trapeze and -5 seconds of time when hit trampoline
  Started Simon's dialogue
  Finished Tarantella, added music to Pie Throwing and Trapeze

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
#	RingMaster/RingMaster/Assets/Scenes/TrapezeTutorial.unity

* daytime:
  pies spawn more frequently and give less bunuses

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

* simonthebear:
  John Smith is half done, Silas is fully done.
  IntroScene seems done =)
  Intro scene is now okay.

player now can hit enter after entering name (its properly prompted now) and the next dialogue will be displayed

* piethrowing:
  Added arrow icons to MimeMime
  Added splat sound when pie lands, background music for Pie Throwing and Daytime
  Added speed selection for MimeMime

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

* commit '736fc963':
  minor changes to intro scene to stop players from going the wrong way

* 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