fixed merge
attempt at fixing merge
fixed merge
adding production settinsg file
Merge pull request #1 from JBKahn/production-settings-to-master

Production settings to master
Merge pull request #1 from Plycion/master

Update master