almost done with drink of the day fragment

Added list elements so they display drink information

need to work on onclick functions
Merge branch 'master' of https://github.com/AndrewMarkley/HackTx

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/Tipsy/.indexes/a
0/d6/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Tipsy/.indexes/a
0/de/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Tipsy/.indexes/h
istory.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Tipsy/.indexes/p
roperties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.de
bug.core.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.
ui.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.co
re.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.la
unching.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.jdt.core/940127056.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	Tipsy/bin/Tipsy.apk
	Tipsy/bin/classes.dex
	Tipsy/bin/classes/com/hacktx/tipsy/Main$DummySectionFragment.class
	Tipsy/bin/classes/com/hacktx/tipsy/Main$SectionsPagerAdapter.class
	Tipsy/bin/classes/com/hacktx/tipsy/Main.class
	Tipsy/bin/classes/com/hacktx/tipsy/R$id.class
	Tipsy/bin/classes/com/hacktx/tipsy/R$layout.class
	Tipsy/bin/classes/com/hacktx/tipsy/R$menu.class
	Tipsy/bin/classes/com/hacktx/tipsy/R$string.class
	Tipsy/bin/classes/com/hacktx/tipsy/R$style.class
	Tipsy/bin/resources.ap_
	Tipsy/gen/com/hacktx/tipsy/R.java
	Tipsy/res/layout/activity_main.xml
	Tipsy/res/values/strings.xml
	Tipsy/src/com/hacktx/tipsy/Main.java