css
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
Button styles for activity page
resolved conflicts