Add line
Merge branch 'master' of github.com:NigoroJr/sandbox

Conflicts:
	reset.txt