Merge branch 'master' of https://github.com/TeddyJeon/Project

Conflicts:
	README.md
Merge branch 'master' of https://github.com/TeddyJeon/Project

Conflicts:
	README.md