Friends list
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
Styles
Merge branch 'master' of https://github.com/jdl39/HappinessTracker