first stuff
Merge branch 'master' of https://github.com/albert-smit/Computer-Graphics-Project