updated cards in HistoryFragment and changed AddFoodActivity a bit
Merge branch 'psuedo_master'