Initial commit
init encrypting desine
merge resolve
Update crypto logic
Clean rep
Modify gitignore
Merge branch 'master' of https://github.com/bozzon/FileEncryptor

Conflicts:
	.gitignore