First commit
Merge branch 'master' of github.com:kjell-gunnar-midtlyng/oppmerksomhetsorganisatoren

Conflicts:
	.gitignore