with initial google map hard-coded
add map page
tinkering with custom markers
add map with smiley face custom marker
merged master with happiness-map
merged branches. Still, there are problems