ssswed
Merge pull request #1 from fanyin/feature1

YO THIS IS COO
Merge remote-tracking branch 'origin/feature2'

Conflicts:
	README.md

	modified:   README.md
	modified:   README.md
Merge remote-tracking branches 'origin/master' and 'origin/feature2' into feature1

Conflicts:
	README.md

	modified:   README.md