Added notes on merge
Merge branch 'master' of https://github.com/varappavoo/gitWorkshopSession

Conflicts:
	notes.txt