code input mode 2
Merge branch 'master' of https://github.com/sleepysimon/mastermind

Conflicts:
	src/de/fuberlin/sp/mastermind/Mastermind.java