update
update
Merge branch 'Long' of https://github.com/longpham91/Cookie-Sale-Project into Long

Conflicts:
	GirlScoutCookies/.classpath
	GirlScoutCookies/bin/GirlScoutCookies.apk
	GirlScoutCookies/bin/classes.dex

GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/CookieBook.clas
s
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$id.class
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$layout.class
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$menu.class
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$string.class
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$style.class
	GirlScoutCookies/bin/resources.ap_
	GirlScoutCookies/gen/com/deitel/girlscoutcookies/R.java
Merge branch 'Long' of https://github.com/longpham91/Cookie-Sale-Project into Long

Conflicts:
	GirlScoutCookies/.classpath
	GirlScoutCookies/bin/GirlScoutCookies.apk
	GirlScoutCookies/bin/classes.dex

GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/CookieBook.clas
s
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$id.class
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$layout.class
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$menu.class
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$string.class
	GirlScoutCookies/bin/classes/com/deitel/girlscoutcookies/R$style.class
	GirlScoutCookies/bin/resources.ap_
	GirlScoutCookies/gen/com/deitel/girlscoutcookies/R.java