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

Conflicts:
	Assets/Gun.cs
	Assets/Materials/asteroid.mat
	Assets/Materials/asteroidMaterial_Type2.mat
	Assets/Scene1.unity
	Assets/asteroids/asteroid 1/Materials/asteroid1.mat
	Assets/asteroids/asteroid 2/Materials/defaultMat.mat
	Assets/asteroids/asteroid 3/Materials/defaultMat.mat
	Assets/asteroids/asteroid 4/Materials/defaultMat.mat
	Assets/asteroids/asteroid 5/Materials/defaultMat.mat
	Assets/asteroids/asteroid 7/Materials/defaultMat.mat
	Assets/asteroids/asteroid 8/Materials/defaultMat.mat
	Assets/asteroids/asteroid 9/Materials/defaultMat.mat