Merge remote-tracking branch 'origin/master' into Anna
Merge branch 'Tobias'
small changes
changes
Merge branch 'Tobias'

Conflicts:
	Server.java
Merge branch 'master' into Emily
Merge branch 'Emily'
Merge branch 'master' into Tobias