Edited and prepared for push to Heroku
Merge branch 'master' of https://github.com/CSSMcMaster/csswebsite

Conflicts:
	tmp/pids/server.pid