bleh
Merge branch 'master' of github.com:Adalden/asteroids2
updated controls and player2 info"
"