Body from feat/tutorial-6-advancegit-1

Body from tut6-for-merge