Merge pull request #1 from achristman2/master

first commit, pull request
Merge branch 'master' of https://github.com/achristman/CS1002