MSC
Merge branch 'master' of https://github.com/holytony/tryGit

Conflicts:
	greeting.html