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

Conflicts:
	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
added gitignore