moved the encryption
Merge branch 'master' of https://github.com/ReneNijhuis/IntegrationProject