encryption bug in main fixed
Revert "encryption bug in main fixed"

This reverts commit 1ec9129775d2bee9f49a9dd83cd053910393e85b.
Merge branch 'master' of https://github.com/ReneNijhuis/IntegrationProject