update on mac
Merge branch 'master' of github.com:Auto-mate/LearnGit

Conflicts:
	basic/index.html