start adding bullets
Merge branch 'master' of https://github.com/jolleon/yelparena into adding_bullets
still adding bullets
merge master
works... but rotated
Merge branch 'master' of github.com:jolleon/yelparena into draw_map_onto_canvas

Conflicts:
	game.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
Merge pull request #7 from jolleon/virginia_add_labels

adding name labels to players
player moves in diagonal
bullets move and are deleted. still need play count
Merge pull request #8 from jolleon/move_diagonal

player moves in diagonal
faster canMove functionality, and map-block calculation
Merge pull request #9 from jolleon/draw_map_onto_canvas

faster canMove functionality, and map-block calculation
add pews