This is a new commit
Merge branch 'master' of https://github.com/Cjones90/newPython

Conflicts:
	newfile.txt