Added Dave's version of samefile
Added Courtnie's version of sameFile
Merge branch 'dave' into courtnie

Conflicts:
	sameFile.txt