Body from feat/tutorial-6-advancedgit-1

Body from tut6-for-merge