endofday3/19
Jason Pre-lunch commit

Parented the constant spawners and modified the renderer and a bit of
the script.
Jason Ege Midday (2:15pm) March 20, 2014

Made changes to the monk script and prefab as well as fixed the sword
guys colliding with each other. Monks no longer collide with sword guys
and vise versa.
Merge pull request #1 from ScrambledEgge101/master

Jason 1st Commit March 20, 2013
Check Jason merge, branch broken
nOTHING changed, just need to switch branches
EndOfDay-InputShouldBeDoneForever
MainLevelZFix
Merge branch 'branch'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
fix input error
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja.userprefs