commitdelete
Merge branch 'master' of https://github.com/Yossig/Test

Conflicts:
	shtut.txt