test
test
Merge branch 'master' of https://github.com/rasumovsky/CS367_P2
minor changes and comments