Canvas
Merge branch 'master' of ssh://github.com/cssa-gamejam-2014/thegame

Conflicts:
	index.html
Merge branch 'master' of ssh://github.com/cssa-gamejam-2014/thegame
Add bank 'art'
Merge branch 'master' of ssh://github.com/cssa-gamejam-2014/thegame