fuck you meixner
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/stockMarketGame/Player.class
	src/stockMarketGame/Player.java