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

Conflicts:
	CHANGELOG.md
conflicts shown, conflict handling commits not perfect