merged
Merge branch 'master' of https://github.com/sysret/learning-git

Conflicts:
	session1.docx