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

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