Merge branch 'master' into psuedo_master
changed button on AddFoodActvity
new resources
changed gitignore
Merge branch 'master' into psuedo_master

Conflicts:
	bin/Innutrac.apk
	bin/classes.dex
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$4.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity.class
	bin/resources.ap_
Removed the now ignored directory"bin"
Removed the now ignored directory"gen"
merge fix mainactivity
merge fix mainactivity
Merge branch 'psuedo_master'

Conflicts:
	bin/Innutrac.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/echo/holographlibrary/R$string.class
	bin/classes/com/echo/holographlibrary/R$style.class
	bin/classes/com/innutrac/poly/innutrac/MainActivity$1.class

bin/classes/com/innutrac/poly/innutrac/MainActivity$DrawerItemClickListe
ner.class
	bin/classes/com/innutrac/poly/innutrac/MainActivity.class
	bin/classes/com/innutrac/poly/innutrac/PieView.class
	bin/classes/com/innutrac/poly/innutrac/R$color.class
	bin/classes/com/innutrac/poly/innutrac/R$dimen.class
	bin/classes/com/innutrac/poly/innutrac/R$integer.class
	bin/classes/com/innutrac/poly/innutrac/R$plurals.class
	bin/classes/com/innutrac/poly/innutrac/R$string.class
	bin/classes/com/innutrac/poly/innutrac/R$style.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$4.class
	bin/classes/com/innutrac/poly/innutrac/WelcomeMessageActivity.class
	bin/classes/it/gmariotti/cardslib/library/R$color.class
	bin/classes/it/gmariotti/cardslib/library/R$dimen.class
	bin/classes/it/gmariotti/cardslib/library/R$integer.class
	bin/classes/it/gmariotti/cardslib/library/R$plurals.class
	bin/classes/it/gmariotti/cardslib/library/R$string.class
	bin/classes/it/gmariotti/cardslib/library/R$style.class
	bin/resources.ap_
	gen/com/echo/holographlibrary/R.java
	gen/com/innutrac/poly/innutrac/R.java
	gen/it/gmariotti/cardslib/library/R.java
updated cards in HistoryFragment and changed AddFoodActivity a bit
Merge branch 'psuedo_master'
Merge branch 'master' of https://github.com/thomt/Innutrac

Conflicts:
	bin/Innutrac.apk
	bin/classes.dex
	bin/classes/com/innutrac/poly/innutrac/AddFoodActivity.class
	bin/classes/com/innutrac/poly/innutrac/DailyPlan.class
	bin/classes/com/innutrac/poly/innutrac/MainActivity$1.class
	bin/classes/com/innutrac/poly/innutrac/MainActivity$DrawerItemClickListener.class
	bin/classes/com/innutrac/poly/innutrac/MainActivity.class
	bin/classes/com/innutrac/poly/innutrac/PieViewFragment$1.class
	bin/classes/com/innutrac/poly/innutrac/PieViewFragment.class
	bin/classes/com/innutrac/poly/innutrac/SplashScreenActivity$1.class
	bin/classes/com/innutrac/poly/innutrac/SplashScreenActivity.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$1.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$2.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$3.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$4.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity.class
	bin/classes/com/innutrac/poly/innutrac/WedgeSummaryActivity.class
	bin/classes/com/innutrac/poly/innutrac/WelcomeMessageActivity$1.class
	bin/classes/com/innutrac/poly/innutrac/WelcomeMessageActivity.class
	bin/classes/com/innutrac/poly/innutrac/database/Food.class
	bin/classes/com/innutrac/poly/innutrac/database/FoodDatabase$FoodDB.class
	bin/classes/com/innutrac/poly/innutrac/database/FoodDatabase.class
	bin/classes/com/innutrac/poly/innutrac/database/ProfileDatabase$ProfileDB.class
	bin/classes/com/innutrac/poly/innutrac/database/ProfileDatabase.class
	bin/classes/com/innutrac/poly/innutrac/database/User.class
	bin/dexedLibs/android-support-v4-1f6d93e4189d9d0dab5289f5955e884e.jar
	bin/dexedLibs/holographlibrary-00fb4743fb216f076f43301e44754970.jar
	bin/dexedLibs/holographlibrary-5562a4e76fac398d8ee9ed9a8647dbf6.jar
	bin/dexedLibs/main-95cbf90eaba599e1567bc7497c7b5118.jar
	bin/resources.ap_
	src/com/innutrac/poly/innutrac/MainActivity.java
fixed alot of bug from previous push