Change last row
Merge branch 'master' of github.com:lazyppp/git_tutorial

Conflicts:
	public/sample.txt