yo new feature
yo second feature
Merge branch 'secondFeature'

Conflicts:
	README.md