5-15-2014 1011

fixed power ups spawning after game ended also adjusted monk attack
boxes
Merge remote-tracking branch 'upstream/master'

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

Sounds in the game
Dragon Fix on Steven2 scene
5-15-2014 1400
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset.meta~6353f7f1284bd9d24ffd66a64e7fb587b538502b.meta
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset.meta~HEAD.meta
	TrickyNinja/TrickyNinja.userprefs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset.meta~6353f7f1284bd9d24ffd66a64e7fb587b538502b.meta
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset.meta~HEAD.meta
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #34 from DevenSmith/master

5-15-2014 1400
rollback
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset.meta~6353f7f1284bd9d24ffd66a64e7fb587b538502b.meta
	TrickyNinja/Assets/Scenes/MainLevel/NavMesh.asset.meta~HEAD.meta
	TrickyNinja/Assets/Scripts/PlayerScriptDeven.cs
	TrickyNinja/TrickyNinja.userprefs