geo rebuild
maps pop up
maps popup
map works
merge conflict
working with controllers
gitignore
merge conflict:
merge conflict
oops -- deleted too much
merge conflict
Merge pull request #1 from plawtr/andrey_MAPS_again

Andrey maps again