Force over old file; it's time
Merge branch 'master' of git@github.com:k-langer/Project1_CS3600
rm file
gah