4-4-2014 1355

monk complete
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Scripts/MonkScript.cs
	TrickyNinja/TrickyNinja.userprefs
4-4-2014 1526
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Prefabs/PlayerPrefabs/PlayerStuff.prefab
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #22 from DevenSmith/master

4-4-2014 1535