Stephans Namen verändert
Merge branch 'master' of https://github.com/arbox/cldh-projektseminar-2013

Conflicts:
	st.txt