로그인/회원가입_1
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man4

Conflicts:
	app/src/main/AndroidManifest.xml
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man4