overwriting initial git history with a more fleshed out version
Merge branch 'master' of https://github.com/finneysm7/Asteroids

Conflicts:
	index.html
	lib/asteroid.js
	lib/game.js
	lib/gameView.js
	lib/movingObject.js
	lib/utils.js
trying to fix git