Merge branch 'master' of https://github.com/KasperFlye/Projekt

Conflicts:
	.gitignore
lene