Create README.md
Merge remote-tracking branch 'choose_remote_name/master'
Merge remote-tracking branch 'github/master'

Conflicts:
	README.md