sync
Merge branch 'master' of github.com:HerrMuellerluedenscheid/msc

Conflicts:
	poster/conference_poster_4.log
	poster/conference_poster_4.pdf
	poster/conference_poster_4.synctex.gz