mering problems
changed settings files for local, added map
commiting before pull from upstream
added more styles to home and base
roughly finished home and list
started mobile styling
uncommented heroku database
started user review form
changed home.html to resolve merge conflict