forgot to close app on iMac
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
some splash menu work, some player prefs work
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
menu work, input manager set up
what happens when you open unity without syncing

:p
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
some more menu work
options menu refining
nice and clean building repetition
GUI experimentation
Finally Decided on Options Menu approach
Character Selection is DOOOOOONE as well as options Menu
capture sequence and level timing work
crisis meter work
tutorial mode work started
mistake
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
more tutorial mode work
no changes