new file:   index.html
	modified:   README.md
	modified:   README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md