Merge pull request #16 from DevenSmith/master

stevense
Added ActivePlayerTracker and ScreenFade
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja.userprefs