rollback
Test rollback
Merge branch 'master' of https://github.com/truce76/FranzyColis

Conflicts:
	FranzyColis.v11.suo
	FranzyColis/obj/Debug/App.g.i.cs
	FranzyColis/obj/Debug/MainPage.g.i.cs
	FranzyColis/obj/Debug/Scanner.g.i.cs
	FranzyColis/obj/Debug/frmLivraison.g.i.cs