First
user names of Felix and Jana added
Merge branch 'master' of git://github.com/karamzad/tipb-exercise into karamzad-master

Conflicts:
	README.md
Merge branch 'karamzad-master'
Merge branch 'master' of git://github.com/limajd/tipb-exercise

Conflicts:
	README.md
Merge branch 'master' of https://github.com/emolch/tipb-exercise

Conflicts:
	README.md
Merge branch 'master' of https://github.com/emolch/tipb-exercise
Update README.md