what time this bitch get out
WHAT TIME DIS BITCH GET OUT?!?!
Merge branch 'master' of https://github.com/UpstreamApp/Upstream

Conflicts:
	res/layout/create_account_activity.xml