Clean up
Merge branch 'master' of https://github.com/mpickering/group-4-practical