edited on computer
Merge branch 'mary'

Conflicts:
	newfile.txt