Update .htaccess file as needed
Merge branch 'master' into production
Merge branch 'master' of github.com:MorehouseJ09/prospero
Update merged (safely)