end music
Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014-v2

Conflicts:
	Assets/Sound/Jump_1.wav.meta
fix