updated
Merge branch 'master' of github.com:joonhwan/study

Conflicts:
	.gitignore