Første commit
Merge branch 'master' of https://github.com/Apasje/test

Conflicts:
	README.md