Merge branch 'master' into production
Trying to get server to pick up styles changes from github

Renaming bootstrap.css to main.css
Merge branch 'production'