Cleanup
Merge branch 'master' of https://github.com/kimcoop/cs1699