stage 1 + 2 for windows
stage 1+2 for windows
ohne zip
Merge remote-tracking branch 'origin/master' into Dani

Conflicts:
	src/Channel/Base64Channel.java
	src/Channel/SecureChannel.java
	src/Client/Client.java
	src/Server/ServerStartUp.java
change @read priv/pub key
Merge branch 'Dani'