git commit -a 'change
Merge branch 'nancy15689-mybranch'
Merge branch 'master' of https://github.com/eric-chahin/python_bugs

Conflicts:
	problems.py