production stuff
Merge branch 'master' of https://github.com/marcjohnstonuw/Thistle-Theatre

Conflicts:
	inc/css/app.css
	page-homepage.php