mering problems
changed settings files for local, added map
commiting before pull from upstream
added more styles to home and base
New things
html templates
roughly finished home and list
started mobile styling
uncommented heroku database
started user review form
changed home.html to resolve merge conflict
handled merge conflict in user_profile.html
ahndled merge conflict in playground_info.html
new things
Merge pull request #12 from josieh/master

started from the base now we here
add a playgrounddd