ccc
Merge branch 'master' of https://github.com/autsatapon/train_git

Conflicts:
	c.txt