Hjelp
Deletes some stuff
Gitmodles
Merge branch 'master' of github.com:auduny/setup

Conflicts:
	.gitmodules