adafas
Merge branch 'teamB_2' of https://github.com/newface2013/git-learning into teamB_2

Conflicts:
	self_introduction_D.txt

hahahahahahahahahahahahahahahahahahahahahaha
Merge branch 'teamB_2' of https://github.com/newface2013/git-learning into teamB_2
Merge branch 'teamB_2' of https://github.com/newface2013/git-learning into teamB_2