modified:   stone.ydk
Merge branch 'master' of https://github.com/Hidfeel/deck

Conflicts:
	stone.ydk
'test2'