push before heroku push
pulled from group master
commit before heroku push
fixed google map bugs on homepage
removed uneccesary files
experimented with rating
merging conflicts