This is a mult-line
commit message.
Merge branch 'master' of https://github.com/yaoyi92/kyle_vmd

Conflicts:
	kyle