OSX
Merge branch 'master' of https://github.com/osuo/Tutorial

Conflicts:
	sample.txt