로그인/회원가입_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
Merge branch 'feature/man2' of https://github.com/Ganco/KNU_Market into feature/man4
merge
Revert "merge"

This reverts commit 5c061fd84e0447741542a694397829db93344178.