i am thomas
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Text Document.txt