start adding bullets
Merge branch 'master' of https://github.com/jolleon/yelparena into adding_bullets
move in all directions
Merge branch 'master' of github.com:jolleon/yelparena
move player firebase stuff to player.js
still adding bullets
merge master
draw gun
works... but rotated
make direction / gun work
Merge branch 'master' of github.com:jolleon/yelparena into draw_map_onto_canvas

Conflicts:
	game.js
Merge pull request #5 from jolleon/move_player_firebase

move player firebase stuff to player.js
missed a semicolon.
drawing bullets at least
Merge branch 'master' of github.com:jolleon/yelparena into draw_map_onto_canvas
colours and stuff and collisions
Merge pull request #6 from jolleon/draw_map_onto_canvas

Draw map onto canvas
less stupid with maps
Merge branch 'master' of https://github.com/jolleon/yelparena into adding_bullets
adding name labels to players