Merge pull request #43 from NintenJoe/Iteration-6-Cleanup

Iteration 6 cleanup
Merging changes with Iteration-6.
Merging changes with the Iteration-6 branch.
Merge branch 'Iteration-6' of github.com:NintenJoe/zol into Task-7.12