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
moar art?
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/Assets/Scenes/MainLevel.unity
	TrickyNinja/TrickyNinja.userprefs
Merge remote-tracking branch 'upstream/master'

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

last build dont break
zx
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/TrickyNinja.userprefs