Merge branch 'master' of https://github.com/bflugon/Fellesprosjekt

Conflicts:
	.gitignore