first commit
Merge branch 'master' of https://github.com/Maromarius/SuperSecretStore

Conflicts:
	src/encs.properties