add 2 coulmns to style in rakefile
Merge branch 'death'
Merge branch 'death'
implement user menu
implement calory return in add feature