init
git ignore
Merge branch 'master' of https://github.com/GfiAgileTeam/Calculatrice

Conflicts:
	src/main/java/fr/gfi/agile/Calculatrice.java