Merge branch 'master' of /Users/moritzscherzinger/Documents/Studium/Semester_4/Skriptsprachen/Workspace/PyAES2 with conflicts.
my changes to core.py for decryption