Questions and changes
Merge branch 'master' into MichaelAngelo

Conflicts:
	css/fp.css
	js/game.js