took out drawing some stuff
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
merge conflicts
fix for x y position on dragged element