Merge pull request #2 from longpham91/master

merge
Merge pull request #9 from longpham91/master

merge for Albert
Merge pull request #12 from longpham91/master

update db
Merge pull request #14 from longpham91/master

merge
Merge pull request #18 from longpham91/master

update
Test push
Merge remote-tracking branch 'upstream/Albert' into Albert
Merge pull request #21 from longpham91/master

update
update
update
Merge pull request #22 from DustyLenz/Albert

Test push
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
update
Merge pull request #25 from longpham91/Albert

Albert
Merge pull request #27 from longpham91/Long

Long
Merge pull request #29 from longpham91/master

merge