Other version
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/jhordan/semprende/main/Login_Screen.java
Version Done 1.0