Merge branch 'master' of github.com:kanghein/test

Conflicts:
	Readme.txt

Signed-off-by: kangheain <with_atom@naver.com>
Merge branch 'master' of github.com:kanghein/test

Conflicts:
	Readme.txt