something is breaking horribly and mine is the only working one
Merge branch 'master' of https://github.com/ssternklar/Imagine-Cup-Game

Conflicts:
	Assets/Debug Scene.unity
	Assets/Prefabs/Ship.prefab