Added some features to Model. Finished YearOfPlenty. Started making JUnit tests.
Merge branch 'master' of https://github.com/Brc509/Settlers

Conflicts:
	server/src/catan/model/Model.java