hoho 브랜치 커밋 20140815 18:18
sssMerge remote-tracking branch 'origin/hoho'

Conflicts:
	src/mina1/mina1.java