"my changes now"
My changes

Merge branch 'master' of https://github.com/smarkley/hellogitworld

Conflicts:
	conflict1.txt
my change
Seans Change 2

Merge branch 'master' of https://github.com/smarkley/hellogitworld

Conflicts:
	fix.txt