Edit file for new_feature.
More exclamations
Merge branch 'new_feature' of https://github.com/miksself/my_really_cool_project

Conflicts:
	file2