Blergh
Merge branch 'master' of git@github.com:Strilanc/GameJam2013.git
Half sparkle
Merge branch 'master' of git@github.com:Strilanc/GameJam2013.git
Asteroid types
Merge branch 'master' of git@github.com:Strilanc/GameJam2013.git

Conflicts:
	Assets/Scene1.unity
Sleep