BlankLogin
BlankLogin
BlackMainActivity
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/ski/spot/LoginActivity.java
	app/src/main/res/layout/activity_login.xml
	app/src/main/res/values/strings.xml
BlankPhotoActivity