commit
Merge branch 'master' of https://github.com/kobadesu/tutorial

Conflicts:
	a.txt