jsadjafshjgejghdfnj;kzdghfnjk'lzdhf
Merge branch 'master' of https://github.com/Musagen/AndroidDev.git

Conflicts:
	BeerApp/src/com/psiengine/beerapp/HelloWorld.java