Ens
Merge branch 'master' of
https://github.com/Freddeg/Eda040---Projektet.git

Conflicts:
	bin/Server/Out.class
Merge branch 'master' of https://github.com/Freddeg/Eda040---Projektet.git