1
Merge branch 'master' of github.com:purtpelhcs/infob

Conflicts:
	Blatt2/Company.java