fb

fb
Merge branch 'master' of https://github.com/bettyleung/cultureshock

Conflicts:
	CultureShock/app/src/main/AndroidManifest.xml

CultureShock/app/src/main/java/com/angelhacks/cultureshock/signup_e.java