configured various files
changed files
cofigured files
adsfadf
aaa
dadfa
rewger
Merge branch 'master' of https://github.com/Jobs92/Avalon

Conflicts:
	workspace/Avalon/src/UnitTests/TestGameManager.java
	workspace/Avalon/src/config/Config.java
	workspace/Avalon/src/departments/Production.java
	workspace/Avalon/src/gameManager/GameManager.java
	workspace/Avalon/src/market/Market.java
	workspace/Avalon/src/test.java

	modified:   workspace/Avalon/src/UnitTests/TestGameManager.java
	modified:   workspace/Avalon/src/company/Company.java
	modified:   workspace/Avalon/src/config/Config.java
	modified:   workspace/Avalon/src/departments/Production.java
	modified:   workspace/Avalon/src/departments/Purchase.java
	modified:   workspace/Avalon/src/gameManager/GameManager.java
	modified:   workspace/Avalon/src/market/Market.java
	modified:   workspace/Avalon/src/test.java
Merge branch 'master' of https://github.com/Jobs92/Avalon