Started formatting info windows for map markers
Merge branch 'master' of https://github.com/ieatkimchi/Bike-1-1 into marker_infowindows
Merge pull request #9 from ieatkimchi/views

Views
fixed merge conflict
Merge pull request #10 from ieatkimchi/marker_infowindows

Marker infowindows
ignore log files
Merge pull request #11 from ieatkimchi/marker_infowindows

ignore log files
Merge branch 'master' into views