new mac os
test
Merge branch 'master' of https://github.com/momogod/MGC

Conflicts:
	.gitignore