docs
Merge branch 'master' of https://github.com/kjt54/cs341project