Merge branch 'Coloroption'
Argparser included
Merge branch 'master' of https://github.com/johalnes/oblig3