removing conflicting files
Merge remote-tracking branch 'origin/master'
remove class files for merge on different computer
Merge branch 'master' of https://github.com/hspinks/cs108