Commit to merge
Merge branch 'master' of github.com:HackNC-CDS/beer-goggles

Conflicts:
	BeerGoggles/src/com/beergoggles/MainActivity.java
Add sorting to list