Merge branch 'master' of https://github.com/andrewgbaker/American-Crew-Style-Quiz

Conflicts:
	coffee/site.js.coffee
	includes/settings.php
	js/site.js