Cleaning code
Merge branch 'master' of github.com:luukgruijs/project6