test2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hsmannheim/ws2014/tpe/smits/ib13/pflichtuebung2/model/Aktie.java