test
Merge branch 'master' of https://github.com/iszmor/Text_Encrypt

Conflicts:
	nbproject/private/private.properties