random stuff
Merge branch 'master' of https://github.com/mattydoincode/games

Conflicts:
	public/javascripts/snake/canvasView.js