calorie feature added
Calorie Feature Implemented (Conflicts Resolved For Now)

Conflicts:
	bin/CalDiningApp.apk
	bin/MainActivity.apk
	bin/classes.dex
	bin/classes/com/example/caldiningapp/Breakfast.class
	bin/classes/com/example/caldiningapp/Dinner.class
	bin/classes/com/example/caldiningapp/Lunch.class
	bin/classes/com/example/caldiningapp/MainActivity$Item.class

bin/classes/com/example/caldiningapp/MainActivity$SectionsPagerAdapter.c
lass
	bin/classes/com/example/caldiningapp/MainActivity$SelectFragment.class
	bin/classes/com/example/caldiningapp/MainActivity.class
	bin/classes/com/example/caldiningapp/R$drawable.class
	bin/classes/com/example/caldiningapp/R$id.class
	bin/classes/com/example/caldiningapp/R$layout.class
	bin/classes/com/example/caldiningapp/R$menu.class
	bin/classes/com/example/caldiningapp/R$string.class
	bin/classes/com/example/caldiningapp/R$style.class
	bin/classes/com/example/caldiningapp/R.class
	bin/classes/com/example/caldiningapp/Syncer.class
	bin/dexedLibs/android-support-v4-7f9116c54f3c60d20bdcf6afd45b90dd.jar
	bin/dexedLibs/android-support-v4-946551d35a81796bfe4c040bd8a7d9db.jar
	bin/dexedLibs/jsoup-1.7.3-801178ee60560a6b4e8781b8b487c246.jar
	bin/dexedLibs/jsoup-1.7.3-e5b055fe7fdc5fccb6e451d84243d93b.jar
	bin/resources.ap_
	gen/com/example/caldiningapp/R.java
	src/com/example/caldiningapp/Breakfast.java
	src/com/example/caldiningapp/Syncer.java