수정전
로그인 수정중
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man2
Merge branch 'feature/man1' of https://github.com/Ganco/KNU_Market into feature/man2

Conflicts:
	app/src/main/java/com/harold/knumarket/Activity/LoginActivity.java
	app/src/main/java/com/harold/knumarket/Activity/RegisterActivity.java
로그온 수정2
로그온 수정3
post activity 오류수정
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man2

Conflicts:
	app/src/main/java/com/harold/knumarket/RegisterActivity.java