Merge pull request #44 from indotek68/master

gon is crazy
working with gon
fixing merge conflicts in fitbit controller
Merge pull request #45 from indotek68/master

added partials folder
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 pull request #46 from indotek68/master

counter
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
changes
Merge pull request #47 from ncaskey04/dev

current changes from master dev
merge conflict resolved
merge conflict resolved
removed fitbit controller
Merge pull request #48 from ncaskey04/dev

removed fitbit controller
merge conflict resolved
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
about us page
Merge pull request #49 from maiahariton/master

about us page
nav bars as partials