Cleaned, I think
Merge branch 'master' of https://github.com/bailedk/IT356-Assignment5