s3 changes in templates
Merge branch 'master' of github.com:TylerFisher/housing-guide
settings fix