Snyggade till kommentarer
Merge branch 'Tobias' into Emily
tagit bort rad
Merge branch 'master' into Emily

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