Cleaned up and commented code
Merge branch 'master' of https://github.com/rhub92/Lab7