n6
Merge branch 'origin' of https://github.com/NaraeH/bit.git into origin

Conflicts:
	GuestBook/src/main/webapp/member.jsp