Matched up styles for friends, goals, etc
Merge branch 'master' of https://github.com/jdl39/HappinessTracker