step 5
Merge branch 'master' of github.com:tongjiechen/toy

Conflicts:
	addNumbers.py