id
Merge branch 'master' of https://github.com/MDiemon/boersenspiel.git

Conflicts:
	Boersenspiel/src/controller/StockExchange.java