commit before conflict merge
Merge branch 'jg-conflict-test' of https://github.com/jacogr/atom-git-control into jg-conflict-test

Conflicts:
	CHANGELOG.md
test again
Merge branch 'jg-conflict-test' of https://github.com/jacogr/atom-git-control into jg-conflict-test

Conflicts:
	CHANGELOG.md
test
use git add before commit (helps a lot in doing merges)
ok, commit seems to work as expected