Adding first version
Merge branch 'master' of https://github.com/OlsonDerek/cs313