Mapping done
CAN done, needs still revision and Conclusio
Merge branch 'master' of https://github.com/traxl/sbcAusarbeitung

Conflicts:
	SBC_Ausarbeitung_Dimitrijevic_Traxler.pdf
Merged with correct PDF