updated
Merge branch 'master' of github.com:freddyC/astroids

Conflicts:
	scripts/gamecontroller.js