done

shat out a game
resolved conflicts
resolved conflicts again
added require.js, which may be good and may not be
Merge branch 'master' of https://github.com/eigenbloom/Laserama

Conflicts:
	Battery.js
	Player.js