Rejected commit: Default
Merge remote-tracking branch 'origin/master'

* origin/master:
  Create README.md
  Delete index.html

Conflicts:
	index.html