stuff
Merge branch 'master' of github.com:teTorrian/TUD-KPMI13-Workshop

Conflicts:
	README.md