-simpler method of indicating padding
Merge branch 'master' of https://github.com/claydiffrient/ModulusTreeEncrypt

Conflicts:
	Java/.idea/workspace.xml