rebasing finish
Merge branch 'master' of github.com:pawelbx/proGitOutline

Conflicts:
	gitBranching.org