Pre pull of new repaired 'MeloBellies' app.
Merge branch 'master' of https://github.com/hdemby/workspace

Conflicts:
	.metadata/.bak_0.log
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log

	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.location

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/ae/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/ae/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/d6/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/d6/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/de/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/e4/81/76/79/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/a0/de/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources

	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3158648900.index
	.metadata/.plugins/org.eclipse.jdt.core/3515282563.index
	.metadata/.plugins/org.eclipse.jdt.core/3946179868.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MeloBellies/bin/MeloBellies.apk
	MeloBellies/bin/R.txt
	MeloBellies/bin/classes.dex
	MeloBellies/bin/classes/com/coursera/melobellies/MainActivity.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$id.class

	MeloBellies/bin/dexedLibs/android-support-v4-210be17ee8ac3c731c5e39a83f13854a.jar

	MeloBellies/bin/dexedLibs/android-support-v7-appcompat-18d0f5ff657014e751d2b3f9bd190ad9.jar

	MeloBellies/bin/dexedLibs/appcompat_v7-ae42838384561bf99555bbbf3a64cbc5.jar
	MeloBellies/bin/resources.ap_
	MeloBellies/gen/com/coursera/melobellies/R.java
	MeloBellies/res/layout-land/activity_main.xml
	MeloBellies/res/layout/activity_main.xml
	MeloBellies/res/values/strings.xml
	MeloBellies/src/com/coursera/melobellies/MainActivity.java
	TestApp/bin/classes/com/coursera/testapp/MainActivity.class
	TestApp/bin/classes/com/coursera/testapp/R$bool.class
	TestApp/bin/classes/com/coursera/testapp/R$color.class
	TestApp/bin/classes/com/coursera/testapp/R$dimen.class
	TestApp/bin/classes/com/coursera/testapp/R$id.class
	TestApp/bin/classes/com/coursera/testapp/R$integer.class
	TestApp/bin/classes/com/coursera/testapp/R$layout.class
	TestApp/bin/classes/com/coursera/testapp/R$menu.class
	TestApp/bin/classes/com/coursera/testapp/R$string.class
	TestApp/bin/classes/com/coursera/testapp/R$style.class
	TestApp/bin/classes/com/coursera/testapp/R$styleable.class
	TestApp/bin/jarlist.cache
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	appcompat_v7/bin/appcompat_v7.jar
Merge branch 'master' of https://github.com/hdemby/workspace

Conflicts:
	.metadata/.bak_0.log
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/ae/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/ae/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/e4/81/76/79/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/a0/ae/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/a0/de/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1864606420.index
	.metadata/.plugins/org.eclipse.jdt.core/3158648900.index
	.metadata/.plugins/org.eclipse.jdt.core/3946179868.index
	.metadata/.plugins/org.eclipse.jdt.core/3963245865.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/MeloBellies/2014/11/46/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/MeloBellies/2014/11/46/refactorings.index
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MeloBellies/bin/MeloBellies.apk
	MeloBellies/bin/R.txt
	MeloBellies/bin/classes.dex
	MeloBellies/bin/classes/com/coursera/melobellies/MainActivity.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$bool.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$color.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$dimen.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$id.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$integer.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$layout.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$menu.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$raw.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$string.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$style.class
	MeloBellies/bin/classes/com/coursera/melobellies/R$styleable.class
	MeloBellies/bin/resources.ap_
	MeloBellies/gen/android/support/v7/appcompat/R.java
	MeloBellies/gen/com/coursera/melobellies/R.java
	MeloBellies/res/values/strings.xml
	TestApp/bin/R.txt
	TestApp/bin/classes/android/support/v7/appcompat/R$anim.class
	TestApp/bin/classes/android/support/v7/appcompat/R$attr.class
	TestApp/bin/classes/android/support/v7/appcompat/R$bool.class
	TestApp/bin/classes/android/support/v7/appcompat/R$color.class
	TestApp/bin/classes/android/support/v7/appcompat/R$dimen.class
	TestApp/bin/classes/android/support/v7/appcompat/R$drawable.class
	TestApp/bin/classes/android/support/v7/appcompat/R$id.class
	TestApp/bin/classes/android/support/v7/appcompat/R$integer.class
	TestApp/bin/classes/android/support/v7/appcompat/R$layout.class
	TestApp/bin/classes/android/support/v7/appcompat/R$string.class
	TestApp/bin/classes/android/support/v7/appcompat/R$style.class
	TestApp/bin/classes/android/support/v7/appcompat/R$styleable.class
	TestApp/bin/classes/android/support/v7/appcompat/R.class
	TestApp/bin/classes/com/coursera/testapp/MainActivity.class
	TestApp/bin/classes/com/coursera/testapp/R$bool.class
	TestApp/bin/classes/com/coursera/testapp/R$color.class
	TestApp/bin/classes/com/coursera/testapp/R$dimen.class
	TestApp/bin/classes/com/coursera/testapp/R$id.class
	TestApp/bin/classes/com/coursera/testapp/R$integer.class
	TestApp/bin/classes/com/coursera/testapp/R$layout.class
	TestApp/bin/classes/com/coursera/testapp/R$menu.class
	TestApp/bin/classes/com/coursera/testapp/R$string.class
	TestApp/bin/classes/com/coursera/testapp/R$style.class
	TestApp/bin/classes/com/coursera/testapp/R$styleable.class
	TestApp/bin/jarlist.cache
	TestApp/bin/resources.ap_
	TestApp/gen/android/support/v7/appcompat/R.java
	TestApp/res/layout-land/activity_main.xml
	TestApp/res/layout/activity_main.xml
	TestApp/res/values/strings.xml
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$bool.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$color.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$dimen.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$id.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$integer.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$layout.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$string.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$style.class
	android-support-v7-appcompat/bin/classes/android/support/v7/appcompat/R$styleable.class
	appcompat_v7/bin/R.txt
	appcompat_v7/bin/appcompat_v7.jar
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$bool.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$color.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$dimen.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$id.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$integer.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$styleable.class
	appcompat_v7/gen/android/support/v7/appcompat/R.java
Recovery 2014-12-12
Merge branch 'master' of https://github.com/hdemby/workspace

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-v7-appcompat/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2378816599.index
	.metadata/.plugins/org.eclipse.jdt.core/3515282563.index
	.metadata/.plugins/org.eclipse.jdt.core/3979862886.index
	.metadata/.plugins/org.eclipse.jdt.core/858952772.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$anim.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$attr.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$bool.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$color.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$dimen.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$drawable.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$id.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$integer.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$layout.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$string.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$style.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R$styleable.class
	Copy of newReader/bin/classes/android/support/v7/appcompat/R.class
	Copy of newReader/bin/classes/cousera/newreader/R$attr.class
	Copy of newReader/bin/classes/cousera/newreader/R$dimen.class
	Copy of newReader/bin/classes/cousera/newreader/R$drawable.class
	Copy of newReader/bin/classes/cousera/newreader/R$layout.class
	Copy of newReader/bin/dexedLibs/android-support-v4-210be17ee8ac3c731c5e39a83f13854a.jar
	Copy of newReader/bin/jarlist.cache
	Copy of newReader/gen/android/support/v7/appcompat/R.java
	Copy of newReader/gen/cousera/newreader/BuildConfig.java
	Copy of newReader/gen/cousera/newreader/R.java
	Copy of newReader/res/menu/main.xml
	Copy of newReader/res/values-v11/styles.xml
	Copy of newReader/res/values-v14/styles.xml
	Reader/gen/coursera/idontknow/BuildConfig.java
	Reader/gen/coursera/reader/BuildConfig.java
	Reader/res/layout/activity_main.xml
	TestApp/bin/classes/android/support/v7/appcompat/R$anim.class
	TestApp/bin/classes/android/support/v7/appcompat/R$attr.class
	TestApp/bin/classes/android/support/v7/appcompat/R$bool.class
	TestApp/bin/classes/android/support/v7/appcompat/R$color.class
	TestApp/bin/classes/android/support/v7/appcompat/R$dimen.class
	TestApp/bin/classes/android/support/v7/appcompat/R$drawable.class
	TestApp/bin/classes/android/support/v7/appcompat/R$id.class
	TestApp/bin/classes/android/support/v7/appcompat/R$integer.class
	TestApp/bin/classes/android/support/v7/appcompat/R$layout.class
	TestApp/bin/classes/android/support/v7/appcompat/R$string.class
	TestApp/bin/classes/android/support/v7/appcompat/R$style.class
	TestApp/bin/classes/android/support/v7/appcompat/R$styleable.class
	TestApp/bin/classes/android/support/v7/appcompat/R.class
	TestApp/bin/classes/com/coursera/testapp/MainActivity.class
	TestApp/bin/classes/com/coursera/testapp/R$anim.class
	TestApp/bin/classes/com/coursera/testapp/R$attr.class
	TestApp/bin/classes/com/coursera/testapp/R$bool.class
	TestApp/bin/classes/com/coursera/testapp/R$color.class
	TestApp/bin/classes/com/coursera/testapp/R$dimen.class
	TestApp/bin/classes/com/coursera/testapp/R$drawable.class
	TestApp/bin/classes/com/coursera/testapp/R$id.class
	TestApp/bin/classes/com/coursera/testapp/R$integer.class
	TestApp/bin/classes/com/coursera/testapp/R$layout.class
	TestApp/bin/classes/com/coursera/testapp/R$menu.class
	TestApp/bin/classes/com/coursera/testapp/R$string.class
	TestApp/bin/classes/com/coursera/testapp/R$style.class
	TestApp/bin/classes/com/coursera/testapp/R$styleable.class
	TestApp/bin/classes/com/coursera/testapp/R.class
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	appcompat_v7/bin/appcompat_v7.jar
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$bool.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$color.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$dimen.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$id.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$integer.class
	appcompat_v7/bin/classes/android/support/v7/appcompat/R$styleable.class
	newReader/res/values-v11/styles.xml
	newReader/res/values-v14/styles.xml
	newReader/res/values/styles.xml
	rate version of newReader/bin/res/crunch/drawable-hdpi/ic_launcher.png
	rate version of newReader/bin/res/crunch/drawable-mdpi/ic_launcher.png
	rate version of newReader/bin/res/crunch/drawable-xhdpi/ic_launcher.png
	simpleTimer/bin/classes/com/example/simpletimer/BuildConfig.class
	simpleTimer/bin/classes/com/example/simpletimer/MainActivity$1.class
	simpleTimer/bin/classes/com/example/simpletimer/MainActivity$2.class
	simpleTimer/bin/classes/com/example/simpletimer/MainActivity$3.class
	simpleTimer/bin/classes/com/example/simpletimer/MainActivity.class
	simpleTimer/src/com/example/simpletimer/MainActivity.java
	simplecounter/AndroidManifest.xml
	simplecounter/bin/AndroidManifest.xml
	simplecounter/bin/R.txt
	simplecounter/bin/classes/coursera/simplecounter/R$id.class
	simplecounter/bin/classes/coursera/simplecounter/R$string.class
	simplecounter/bin/classes/coursera/simplecounter/R$styleable.class
	simplecounter/bin/resources.ap_