Project
Merge branch 'develop' of https://github.com/Clark2309/cfDeCrypt into develop

Conflicts:
	.idea/cfDeCrypt.iml
	.idea/workspace.xml