Jason March 26, 2014

Got a new working scene that is up to date and running and building
without errors and with enemies appearing and working almost 100%
Merge pull request #7 from DevenSmith/master

Pull Your Face Steven
Monk Pimary Player Fix

The monk now attacks the primary player instead of the first player it
finds.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Scripts/ConstantSpawnerScript.cs
	TrickyNinja/TrickyNinja.userprefs
Fixes

Deven got the jump back of the sword guy working. Monk now follows the
Incorporeal player instead of the first player in the player array.
VersionNumberAndRequestFinished
Hello
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #9 from ScrambledEgge101/master

Another pull request
Enter Jason?
More?
Merge remote-tracking branch 'origin/branch'
ShadowRenderAndSwapAdjust
Merge remote-tracking branch 'upstream/master'

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