오류생겨 커밋
오류생겨 다시 커밋합니다
Merge branch 'master' of https://github.com/t13579a/AFK_GooD

Conflicts:
	TravelCommunity/WebContent/WEB-INF/view/testRegister.jsp
	TravelCommunity/src/com/AFK/travel56/control/CommandFactory.java
	TravelCommunity/src/com/AFK/travel56/control/RegisterMemberCommand.java