Music Feature

The music now changes to better suit where you are in the level.
Merge remote-tracking branch 'upstream/master'
Merge pull request #39 from ScrambledEgge101/master

Music Feature
5-16-2014 1738
Merge remote-tracking branch 'upstream/master'

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