modified:   .gitignore
	modified:   bin/content/Content.class
	modified:   bin/content/Money.class
	modified:   bin/letter/Inhabitant.class
	modified:   bin/letter/SimpleLetter.class
	modified:   bin/tests/CityTest.class
	modified:   bin/tests/MoneyTest.class
	modified:   src/content/Content.java
	modified:   src/content/Money.java
	modified:   src/letter/Inhabitant.java
	modified:   src/letter/PromissoryLetter.java
	modified:   src/letter/SimpleLetter.java
	modified:   src/tests/MoneyTest.java
Merge branch 'master' of https://github.com/kalifousHome/courriers

Conflicts:
	bin/letter/Inhabitant.class
	bin/tests/CityTest.class
	src/letter/Inhabitant.java

	modified:   src/letter/City.java
	modified:   src/letter/Inhabitant.java
	modified:   src/tests/CityTest.java