Rename to appease the Checkstyle gods
Merge branch 'master' of github.com:coldstar96/cse403