init
Merge branch 'master' of https://github.com/mygithubvip/AesDemo

Conflicts:
	.gitignore
init