with passwords! without email sending
Merge branch 'master' of https://github.com/panfayang/EncrypTextV0

Conflicts:
	bin/EncrypTextV0.apk
	bin/classes.dex
	bin/classes/com/example/encryptextv0/Enter_Key.class
	bin/classes/com/example/encryptextv0/MainActivity.class
	bin/classes/com/example/encryptextv0/R$id.class
	bin/classes/com/example/encryptextv0/R$layout.class
	bin/classes/com/example/encryptextv0/R$menu.class
	bin/classes/com/example/encryptextv0/R$string.class
	bin/classes/com/example/encryptextv0/R$style.class
	bin/classes/com/example/encryptextv0/View_List.class
	bin/resources.ap_
	gen/com/example/encryptextv0/R.java