merge conflict resolved
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
styling
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
add styling
Merge pull request #64 from indotek68/master

added styling to show