api 쪽 수정
충돌 수정
Merge branch 'master' of https://github.com/maximinhan/applechip.git

Conflicts:
	build.gradle
jetty 추가