modified:   src/tests/CityTest.java
	modified:   bin/letter/Account.class
	modified:   bin/letter/City.class
	modified:   bin/letter/Inhabitant.class
	modified:   bin/tests/CityTest.class
	modified:   src/letter/City.java
	modified:   src/letter/Inhabitant.java
	modified:   src/tests/CityTest.java
	modified:   bin/letter/Account.class
	modified:   bin/letter/City.class
	modified:   bin/letter/Inhabitant.class
	modified:   bin/tests/CityTest.class
	modified:   src/letter/City.java
	modified:   src/letter/Inhabitant.java
	modified:   src/tests/CityTest.java
Merge branch 'master' of https://github.com/kalifousHome/courriers

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

	modified:   bin/content/AcknowledgmentReceipt.class
	modified:   bin/content/Money.class
	modified:   bin/content/Text.class
	modified:   bin/content/Thanks.class
	modified:   bin/letter/PromissoryLetter.class
	modified:   bin/tests/CityTest$TestCity.class
	new file:   bin/tests/MoneyTest.class
	new file:   bin/tests/TextTest.class
	modified:   src/content/AcknowledgmentReceipt.java
	modified:   src/content/Money.java
	modified:   src/content/Text.java
	modified:   src/content/Thanks.java
	modified:   src/letter/PromissoryLetter.java
	modified:   src/tests/CityTest.java
	new file:   src/tests/MoneyTest.java