Finished GUI tests, changed anon image, improved edit profile page
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator
Added gauge pics
Fixed merge conflict