front end changes
Merge branch 'newAesthetic'
updated friends.json to make gravatar work
Merge branch 'master' of https://github.com/StephenJayYoung/CityHacker