updating stuff
Merge https://github.com/Spedxing/Immigrants-of-Canat

Conflicts:
	ImmigrantsOfCanat/src/deck/Deck.java
	ImmigrantsOfCanat/src/deck/DevCardDeck.java
fixing typo
Merge branch 'master' of https://github.com/Spedxing/Immigrants-of-Canat
add image stuff