one more conflict test
Merge branch 'master' of https://github.com/jacogr/atom-git-control

Conflicts:
	CHANGELOG.md
commit button should also be available when in a merge