such a cool new feature
Merge branch 'amazingNewFeature'

Conflicts:
	README.md