Updated readme

Updated readme
Merge branch 'master' of https://github.com/johnyp/Projekt

Conflicts:
	README.md