Zweiter Commit
Merge branch 'master' of https://github.com/tgm-sgeyer/FSK_AU12.git

Conflicts:
	src/fockkoelblschwenzner/ShiftCipher.java