stuff
Merge branch 'master' of github.com:rolandhediger/apsi_lab

Conflicts:
	code/apsi_lab2/.classpath
	code/apsi_lab2/src/ch/fhnw/oeschfaessler/apsi/lab2/model/Company.java
	code/apsi_lab2/src/ch/fhnw/oeschfaessler/apsi/lab2/servlet/RattleBits.java
done