Revert 234e6ba..8ddffc2

This rolls back to commit 234e6ba70dce9647bc758de552e97882fe705e65.
Merge branch 'master' of https://github.com/KorvMedBrod/ErlangSocketServer

Conflicts:
	mapreduce.erl