IDE3
Merge branch 'master' of https://github.com/inherithandle/git_prac.git

Conflicts:
	src/com/nhnent/prac/prac.java