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