i deleted everything
Merge remote-tracking branch 'origin/master'

Conflicts:
	BookUM/AndroidManifest.xml
	BookUM/bin/AndroidManifest.xml
	BookUM/bin/BookUM.apk
	BookUM/bin/classes.dex
	BookUM/bin/classes/com/example/bookum/BuyBookListActivity.class
	BookUM/bin/classes/com/example/bookum/MainActivity$1.class
	BookUM/bin/classes/com/example/bookum/R$id.class
	BookUM/bin/classes/com/example/bookum/R$layout.class
	BookUM/bin/classes/com/example/bookum/R$menu.class
	BookUM/bin/classes/com/example/bookum/R$string.class
	BookUM/bin/classes/com/example/bookum/R$style.class
	BookUM/bin/resources.ap_
	BookUM/gen/com/example/bookum/R.java
	BookUM/res/values/strings.xml
	BookUM/src/com/example/bookum/BuyBookListActivity.java
	BookUM/src/com/example/bookum/MainActivity.java