Final changes and edits
Merge branch 'master' of https://github.com/Isolol/assignment-4