added getCurrentEvent() methods
Merge branch 'master' of https://github.com/josiahbgrace/DrinkTracker

Conflicts:
	bin/classes/edu/rice/kwl2/drinktracker/MainActivity.class
	bin/classes/edu/rice/kwl2/drinktracker/R$drawable.class
	bin/classes/edu/rice/kwl2/drinktracker/R$id.class
	bin/classes/edu/rice/kwl2/drinktracker/R$layout.class
	bin/classes/edu/rice/kwl2/drinktracker/R$menu.class
	bin/classes/edu/rice/kwl2/drinktracker/R$string.class
	bin/classes/edu/rice/kwl2/drinktracker/R$style.class
	gen/edu/rice/kwl2/drinktracker/R.java