Style and documentation changes

Put spaces between distinct words please ._.
Merge branch 'master' of https://github.com/josiahbgrace/DrinkTracker

Conflicts:
	src/edu/rice/kwl2/drinktracker/MainActivity.java
Merge branch 'master' of https://github.com/josiahbgrace/DrinkTracker