Ignor this
Merge branch 'master' of https://github.com/calumk/NewFile-OSX

Conflicts:
	README.md