tweak styling, add markers to google map
merge upstream
Merge pull request #29 from JakeRawr/master

tweak styling, add markers to google map