removed duplicates
Merge branch 'master' of https://github.com/1ngrid/INF1000