Yosemite Changes
Merge branch 'master' of https://github.com/MacPractice/RNCryptor

Conflicts:
	RNCryptor.xcodeproj/project.pbxproj