PH: Pushing up toast crap
Merge branch 'master' of https://github.com/phalpin/WhatsUp

Conflicts:
	app/src/main/java/com/group2/whatsup/LoginScreen.java