user names of Felix and Jana added
Merge branch 'master' of https://github.com/emolch/tipb-exercise

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