Merge pull request #6 from KShaw29/timsBranch

Tims branch
added drink list. pulls from database
finishing things
Merge branch 'masterCopyKelly' into testMerge

Conflicts:
	.classpath
	AndroidManifest.xml
	bin/AndroidManifest.xml
	res/layout/activity_my_tab.xml
	res/values/strings.xml
fixing things
fix?
MASTER~!!!1!!!11one!!
Merge pull request #7 from KShaw29/testMerge

Test merge
Ryans commit. Added liquor listview
Merge pull request #8 from KShaw29/ryansList

Ryans commit. Added liquor listview
Threw in the calc