edit-new-feature
master edit
Merge branch 'edit-new-feature'

Conflicts:
	new-feature.py