//milane green
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cryptography.iml
	Cryptography/Cryptography-Cryptography.iml
Merge remote-tracking branch 'origin/master'
//milane green
vernam
vernam done
Merge branch 'master' of https://github.com/felizami/Cryptography

Conflicts:
	Cryptography/src/main/java/com/silentflutes/cryptography/Vernam/Vernam.java
	Cryptography/src/main/java/com/silentflutes/cryptography/Vernam/Vernamconfigure.java
Merge pull request #8 from felizami/master

vernam done!!!!!