Changed line endings
Merge branch 'master' of https://github.com/SeanStiny/Skoope.git

Conflicts:
	SkoopeServer/src/OutgoingMessage.java