fixed typos
Merge remote-tracking branch 'rainer/master'

Conflicts:
	midtermpres/main.tex
added ros packages
Merge remote-tracking branch 'julian/master'