modified:   README.md
	modified:   README.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore