dd:wq
Merge branch 'master' of https://github.com/HackNC-CDS/beer-goggles

Conflicts:
	BeerGoggles/bin/classes/com/beergoggles/MainActivity.class
	BeerGoggles/bin/classes/com/beergoggles/R$drawable.class
	BeerGoggles/bin/classes/com/beergoggles/R$id.class
	BeerGoggles/gen/com/beergoggles/R.java
	BeerGoggles/res/layout/activity_main.xml
	BeerGoggles/src/com/beergoggles/MainActivity.java