3
Merge branch 'origin/master'

Conflicts:
	New Text Document.txt