testing
updated to master
added moving enemies!
new stuffs
lots of stuff
alot of stuff
fixed name not showing
changed many interesting things.
fix for merge conflicts

Conflicts:
	game.js