merge
Merge branch 'master' of github.com:mcandre/ios7crypt

Conflicts:
	ruby/README.md