blabla
Merge branch 'master' of https://github.com/MatthiasCK/StochInf_SS14

Conflicts:
	StoInf_SS14/blatt02/Ha02.pdf
bal