Revert "fixed conflicts"

This reverts commit e385e7322282c3e4410972d7f5ca5a19d8fd378b, reversing
changes made to 0291b4b901353e65b2cdbdcb40284859ef7de73b.
Added name.
Merge branch 'master' of https://github.com/NUDM/LearningGitHub

Conflicts:
	NAMES.txt