james add
Merge branch 'master' of https://github.com/philopian/learning

Conflicts:
	file2.txt