hotfix
hotfix changes
Merge branch 'hotfix'

Conflicts:
	trainme/yogi.txt