bla
worked on google maps
resolved conflict
fixed rspec bugs
last commit
resolve merge conflict
resolved all merge conflicts
Merge pull request #35 from fox-squirrels-2013/test_google_maps

Test google maps