r+
background
Add a background
Add hud
Add rotation
Add camera
Add collision detection
Add main player entity
initial hud work
Controls for player.
initial intro wip
Merge remote-tracking branch 'origin'

Conflicts:
	js/game.js
	js/main.js
bossos
Merge branch 'master' of github.com:bgirard/ToJAM2013
Add sprites
Merge conflicts
Clamp velocity.
player var
boss os
Merge branch 'master' of github.com:bgirard/ToJAM2013