pull 오류 있어서 커밋합니다
Merge branch 'master' of https://github.com/t13579a/AFK_GooD

Conflicts:
	TravelCommunity/build/classes/.gitignore
Merge branch 'master' of https://github.com/t13579a/AFK_GooD