skr
Merge branch 'master' of https://github.com/nekjine/test

Conflicts:
	thefile.txt