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

Conflicts:
	src/votingSystem/Constants.java
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
Steps 1 through 3 working
Merge branch 'master' of github.com:jaegs/voting_system

Conflicts:
	src/votingSystem/cTF/CTF.java