Linus forced me to push
Merge branch 'master' of https://github.com/antonhedstrom/multisnake

Conflicts:
	public/assets/js/main.js