changed Atmel Solution File
Merge branch 'master' of https://github.com/open-conflict/FW_ConFLiCT

Conflicts:
	ConFLiCT/ConFLiCT.atsuo
table of carriages updated