styling main page and locations
Merge remote-tracking branch 'origin/master'
coverage
resolved coverage merge conflict
passing test for location model