Finished Break on Click
merge
Merge branch 'master' of github.com:josiahbgrace/DrinkTracker

Conflicts:
	src/edu/rice/kwl2/drinktracker/MainActivity.java