finished master.tex
Merge branch 'develop' of https://github.com/se-2014-2015/semesteraufgabe into develop

Conflicts:
	doc/latex/pflichtheft/master.tex