gitignore
검색 Activity 레이아웃, Java 구현중 (서버테스트 안해봄)
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man2
알람창, 키워드설정, 추가, 검색창 수정
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man2
search1
search & alarm Layout,Activity edit
액티비티간 이동시 키워드값  보존, preference로 키워드값 입출력
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man2

Conflicts:
	app/src/main/java/com/harold/knumarket/MainActivity.java
	app/src/main/java/com/harold/knumarket/User_Info.java
	build/intermediates/model_data.bin
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man2
병합, 빌드성공 버전. 코드충돌 해결