Random git/unity weirdness...
Merge branch 'master' of https://github.com/andallas/Tones-Adventure

Conflicts:
	Assets/Docs/Concept/TonePosterWIP.jpg.meta
	Assets/Resources/Texture/Tone/tone_die_spriteSheet.png.meta
	Assets/Resources/Texture/Tone/tone_idle_spriteSheet.png.meta
	Assets/Resources/Texture/Tone/tone_jumpIdle_spriteSheet.png.meta
	Assets/Resources/Texture/Tone/tone_jump_spriteSheet.png.meta
	Assets/Resources/Texture/Tone/tone_walk_spriteSheet.png.meta