changed file name
Merge branch 'master' of https://github.com/cameronmccord2/cs340
Merge branch 'master' of https://github.com/cameronmccord2/cs340
added some more javadocs
Merge branch 'master' of https://github.com/cameronmccord2/cs340