Changed.
Merge branch 'master' of github.com:MaryOlivier/July-17th

Conflicts:
	File 1.txt