Some merge
Merge branch 'master' of https://github.com/Goforhistory/IN2_prg_practice
Stop trading method
Merge branch 'master' of https://github.com/Goforhistory/IN2_prg_practice

Conflicts:
	src/boersenspiel/AccountManager.java
	src/boersenspiel/AccountManagerImpl.java
	src/boersenspiel/AutoTrader.java