works... but rotated
Merge branch 'master' of github.com:jolleon/yelparena into draw_map_onto_canvas

Conflicts:
	game.js
missed a semicolon.
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