More code edited, document written
Merge branch 'master' of https://github.com/skclifton/cs4414-project
Stuff edited on server :(