4-4-2014 1355

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

Conflicts:
	TrickyNinja/Assets/Scripts/MonkScript.cs
	TrickyNinja/TrickyNinja.userprefs
Update tracker, fixed webbuild, and whatever
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	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
more changes
4-4-2014 1751
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge pull request #23 from DevenSmith/master

last second friday
More fixes, level swap, level layout
fixed camera, spawners, and new massout
added vinessa mics fx
Title
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Scripts/MonkScript.cs
	TrickyNinja/TrickyNinja.userprefs