temporary commit
Merge branch 'master' of https://github.com/benjaminrodigas/possible-city-static
changed the syles in the sidebar
pulled Justin's changes. Fixed conflicts