Update UI
Merge branch 'master' of github.com:HackNC-CDS/beer-goggles

Conflicts:
	BeerGoggles/bin/classes/com/beergoggles/MainActivity.class
	BeerGoggles/bin/classes/com/beergoggles/R$attr.class
	BeerGoggles/bin/classes/com/beergoggles/R$dimen.class
	BeerGoggles/bin/classes/com/beergoggles/R$drawable.class
	BeerGoggles/bin/classes/com/beergoggles/R$id.class
	BeerGoggles/bin/classes/com/beergoggles/R$layout.class
	BeerGoggles/bin/classes/com/beergoggles/R$menu.class
	BeerGoggles/bin/classes/com/beergoggles/R$string.class
	BeerGoggles/bin/classes/com/beergoggles/R$style.class
	BeerGoggles/bin/classes/com/beergoggles/R.class
	BeerGoggles/gen/com/beergoggles/R.java