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

Conflicts:
	skycopy.txt
Committed.
About to push
commit
Merge branch 'master' of github.com:MaryOlivier/July-17th

Conflicts:
	commitandpush.txt