Pre-Pull 122/03/2014
Merge branch 'master' of https://github.com/hdemby/workspace

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/a0/ae/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/a0/ae/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/a0/de/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/e4/76/d4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.projects/CoinToss/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.projects/MeloBellies/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestApp/1.tree
	.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/.root/34.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.core.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1284074322.index
	.metadata/.plugins/org.eclipse.jdt.core/3515282563.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.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	CoinToss/bin/CoinToss.apk
	CoinToss/bin/R.txt
	CoinToss/bin/classes.dex
	CoinToss/bin/classes/coursera/cointoss/MainActivity.class
	CoinToss/bin/classes/coursera/cointoss/R$id.class
	CoinToss/bin/classes/coursera/cointoss/R$integer.class
	CoinToss/bin/classes/coursera/cointoss/R$layout.class
	CoinToss/bin/classes/coursera/cointoss/R$menu.class
	CoinToss/bin/classes/coursera/cointoss/R$string.class
	CoinToss/bin/classes/coursera/cointoss/R$style.class
	CoinToss/bin/classes/coursera/cointoss/R$styleable.class
	CoinToss/bin/dexedLibs/android-support-v4-210be17ee8ac3c731c5e39a83f13854a.jar
	CoinToss/bin/dexedLibs/android-support-v7-appcompat-18d0f5ff657014e751d2b3f9bd190ad9.jar
	CoinToss/bin/dexedLibs/appcompat_v7-ae42838384561bf99555bbbf3a64cbc5.jar
	CoinToss/bin/jarlist.cache
	CoinToss/bin/resources.ap_
	CoinToss/gen/coursera/cointoss/R.java
	TestApp/bin/TestApp.apk
	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
	TestApp/bin/dexedLibs/android-support-v4-210be17ee8ac3c731c5e39a83f13854a.jar
	TestApp/bin/dexedLibs/android-support-v7-appcompat-18d0f5ff657014e751d2b3f9bd190ad9.jar
	TestApp/bin/dexedLibs/appcompat_v7-ae42838384561bf99555bbbf3a64cbc5.jar
	TestApp/bin/resources.ap_
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	appcompat_v7/bin/appcompat_v7.jar