refactor
Merge branch 'master' of https://github.com/adellantado/friend_burster

Conflicts:
	game.js
	main.html