conflict2
Merge branch 'master' of https://github.com/breadval/alm-git

Conflicts:
	README.md