Merge branch 'master' of https://github.com/ejbs/indaprojekt

Conflicts:
	README.md
changed README