Add edit at 12:33 and add newFile.py
Add a comment to newFile
Add a second comment
Add commit at 13:10
Merge branch 'master' of https://github.com/joejk2/config

Conflicts:
	README.md