test
Merge branch 'master' of https://github.com/Bre-Works/DreamyFront-v02

Conflicts:
	app/src/main/java/com/breworks/dreamy/logIn.java