pending merge
Merge branch 'master' of https://github.com/simondai13/Projects-DS.git

Conflicts:
	DSProject1/BadFileCopyOut.txt
	DSProject1/src/BadFileCopy.java
	DSProject1/src/Main.java