working with gon
fixing merge conflicts in fitbit controller
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
updated static date in dynamic and removed fitbit stuff
dynamic date in user show, deleted fitbit stuff
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
changes
Merge pull request #47 from ncaskey04/dev

current changes from master dev