Changed file names
Merge branch 'master' of github.com:steventrouble/cs118-final-project