* simonthebear:
  Mime mime tutorial improved.
  take this, it's dangerous to go alone.

# Conflicts:
#	RingMaster/RingMaster/ProjectSettings/ProjectVersion.txt

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Saved the scene kappa.

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  mime mime is balanced?

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  textmeta, please no break.

* 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