wrote 11 passing tests for homepage_spec
coverage
resolved merge conflicts
writing some jasmine tests for map
Merge remote-tracking branch 'origin/master'
coverage
resolved coverage merge conflict