1er commit prototype
Rebase
ProtoPrototype
Merge remote-tracking branch 'origin/prototype' into prototype

Conflicts:
	src/tollBarrier/barrier/Debit.java
	src/tollBarrier/barrier/TollBarrier.java
tentativ proto parametrable
Amelioration borne
improved .gitignore
Merge branch 'master' of https://github.com/quentinRi/TollBarrier

Conflicts:
	src/tollBarrier/bornes/BoAutomatique.java
	src/tollBarrier/bornes/BoManuelle.java
	src/tollBarrier/bornes/BoTelePeage.java
	src/tollBarrier/bornes/Borne.java
	src/tollBarrier/vehicule/FileDAttente.java
Merge prototype
Merge remote-tracking branch 'Warrows/master'
Merge pull request #10 from Warrows/master

Merge prototype et master