Update mitschrift.md
Merge branch 'master' of https://github.com/schmafu/uni

Conflicts:
	phil/ws2014/SE_Durkheim_Mauss_Halbwachs/mitschrift.md