endofday3/19
Check Jason merge, branch broken
EndOfDay-InputShouldBeDoneForever
MainLevelZFix
Merge branch 'branch'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
fix input error
I don't know

I don't know what happened here, but it wants me to commit so I will.