Prefabs
Merge branch 'master' of https://github.com/acbui/gamerella2014

Conflicts:
	gamerella2014/Assets/Prefabs/Boss.prefab
	gamerella2014/Assets/Scenes/Main.unity
	gamerella2014/Assets/Sprites/bg_final.png.meta
	gamerella2014/Assets/Sprites/bg_final_foreground.png.meta
	gamerella2014/Assets/Sprites/boss pieces.meta
	gamerella2014/Assets/Sprites/boss pieces/boss_arm_lower.png.meta
	gamerella2014/Assets/Sprites/boss pieces/boss_arm_upper.png.meta
	gamerella2014/Assets/Sprites/boss pieces/boss_hand.png.meta
	gamerella2014/Assets/Sprites/boss pieces/boss_head.png.meta
	gamerella2014/Assets/Sprites/boss pieces/boss_legs.png.meta
	gamerella2014/Assets/Sprites/boss pieces/boss_tail.png.meta
	gamerella2014/Assets/Sprites/boss pieces/boss_torso.png.meta
	gamerella2014/Assets/Sprites/boss pieces/boss_torso_lower.png.meta
	gamerella2014/Assets/Sprites/crater bg.png.meta