what did I do?
Merge branch 'master' of github.com:asperheim/mesangitkurs

* 'master' of github.com:asperheim/mesangitkurs:
  commit and run
  auda
  konfllikt?

Conflicts:
	.gitignore