turning off EE for production site for the moment
added phpinfo
Merge branch 'develop' of github.com:noslouch/pa into develop
test commit
empty commit
empty commit
empty commit
empty commit
empty commit
small change on film loop
css re-compiled
Merge branch 'master' of heroku.com:peterarnell-staging into staging

Conflicts:
	phpinfo.php
Adding change on film
Merge branch 'develop' of https://github.com/noslouch/pa into develop
Adding change on film
Change on Awards
Merge branch 'develop' into staging
Changes on the backspace part of the loop
Adding JSON Parse
updated viewport tag