newfaceu213011　【更新】
Merge branch 'master' of https://github.com/newface2013/git-learning.git

Conflicts:
	self_introduction.txt
Merge branch 'master' of https://github.com/newface2013/git-learning.git
Merge branch 'master' of https://github.com/newface2013/git-learning.git
newfaceu213011　【演習２】