Merge branch 'master' of https://github.com/chrismanahan/Obj-C-Tools

Conflicts:
	README.md
Merge branch 'master' of https://github.com/chrismanahan/Obj-C-Tools