README conflict
Merge branch 'master' of github.com:miyabihito/training

Conflicts:
	README.md