...
Merge branch 'master' of github.com:jaegs/voting_system
...
Merge branch 'master' of github.com:jaegs/voting_system
Merge branch 'master' of github.com:jaegs/voting_system
Merge branch 'master' of github.com:jaegs/voting_system

Conflicts:
	src/votingSystem/cTF/Protocol.java
created MessageMap class to format messages sent across the socket
Merge branch 'master' of github.com:jaegs/voting_system