Commit progress on ps10
Merge branch 'master' of https://github.com/stenrap/CS-4400