8th attempt +1:
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/Game.js