WUT
Merge branch 'master' of github.com:nmercer/Flappy-Doge

Conflicts:
	public/scripts/game.js
Merge branch 'master' of github.com:nmercer/Flappy-Doge

Conflicts:
	public/scripts/game.js