Added linux support
Merge branch 'master' of https://github.com/MadsWesti/sad1-week2