The Mac rocks.
Merge branch 'master' of https://github.com/bgever/test

Conflicts:
	Hello World!.txt