Mac Commit
Merging files

Conflicts:
	README.md