alfsdkklsdjFsxncMerge branch 'master' of https://github.com/DevenSmith/TrickyNinja-1 into DevenSmith-master

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
February 28, 2014

Added tons and tons of comments.
Added JasonWorld.
Added functionality to JasonWorld.
Fixed some bugs
Still working on others
February 28, 2014 @ 5_07pm

Added some stuff.
Added some more stuff.
Added even more stuff.
Maybe not dat much.
But 4 realz, do.
Got JasonScene functional with enemies spawning.
Commit1
JasonMerge
Merge branch 'master' of https://github.com/ScrambledEgge101/Trickyninja-1 into ScrambledEgge101-master

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge branch 'DevenSmith-master'

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge branch 'DevenSmith-master' into pr/7

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge branch 'pr/7'

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
3/5/2014 1602
PlayerPrefabFixedSteven