.
Merge branch 'master' of https://github.com/youlovestook/PEA_application

Conflicts:
	PasswordEncryptionApplication/PasswordEncryptionApplication.suo