minor gui changes
resolved conflicts
merged gamat work
merged gamat work
Added tabbed activity; added home, meal planner, calorie counter, and calendar fragments
improved the layout of home fragment