수정전
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