aSTEROID
Merge branch 'master' of git@github.com:Strilanc/GameJam2013.git

Conflicts:
	Assets/Ship.cs