Split things up from the huge main file..
Merge branch 'master' of https://github.com/Grupp2/Computer-Graphics-Project