12
Merge branch 'master' of https://github.com/herozb/git

Conflicts:
	readme.txt