Cleaned up unnecessary files
Merge branch 'master' of github.com:egenvall/ProjektIT
Solved a conflict