i dont know what i changed...
solved a conflict i think! Merge branch 'master' of https://github.com/ChrisQuignon/youbot_mini

Conflicts:
	presentation/MiniProjekt.tex
Merge branch 'master' of https://github.com/ChrisQuignon/youbot_mini