Merge origin/master

Conflicts:
	.gitignore
	src/com/finalproject/asteroid/Asteroid.java
Merge origin/master

Conflicts:
	.gitignore
	src/com/finalproject/asteroid/Asteroid.java