merge conflict resolved
merge conflict resolved
merge conflict resolved
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
Merge pull request #50 from maiahariton/master

nav bars as partials
merge conflict resolved
merge conflict
added cal info
Merge pull request #51 from indotek68/master

Cals In
index and show pages