Added ActivePlayerTracker and ScreenFade
4-3-2014 959
Merge remote-tracking branch 'upstream/master'

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

4-3-2014 1010
More fixes
4-3-2014 1350
Added Main music
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #18 from DevenSmith/master

4-3-2014 1505
4-3-2014 1614

working i guess
Merge remote-tracking branch 'upstream/master'
Merge pull request #19 from DevenSmith/master

4-3-2014 1616
I give up

Conflicts:
	TrickyNinja/Assets/Prefabs/AnimationRig_V3.prefab
	TrickyNinja/Assets/Scripts/MonkScript.cs
	TrickyNinja/TrickyNinja.userprefs