Added GUI tests, incorporated Zach's image stuff
Added GUI tests
Fixed merge conflicts
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator