Added Choose Drink Activity
going to try this rebase thing
oops gitignore
Merge branch 'somethingelse' into testMerge

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	res/values/strings.xml
	src/com/itcs4155/haveyourbac/MyTab.java
	src/com/itcs4155/haveyourbac/Signup.java
	src/com/itcs4155/haveyourbac/UserLogin.java