Saved scene lel
Merge branch 'master' of https://github.com/acbui/gamerella2014

Conflicts:
	gamerella2014/Assets/Scenes/Main.unity
	gamerella2014/Assets/Sprites/temp assets/archer.png.meta
	gamerella2014/Assets/psdfiles/boss-Recovered.psd.meta