Remove lingering 'com.example' references
Merge branch 'master' of https://github.com/wraziens/INFO6130

Conflicts:
	DrinkingApp/AndroidManifest.xml
	DrinkingApp/src/cornell/drinkingapp/MainActivity.java
Small change