first commit
Merge branch 'master' of
https://github.com/MassonSilvestre/iutvalence-java-tp-2014-g2c-binome4.git

Conflicts:
	.project
	src/Application.java
	src/Plateau.java