add a new plugin
This is another line added by YQ (after creating gitflow branch yq)
add tool
Merge branch 'magento_branch1' into feature/yq
 * Add another line to demostrate
edit same line
add test
Merge branch 'feature/yq' of https://github.com/rickyliqi/magento3 into feature/yq

Conflicts:
	index.php
Merge branch 'feature/yq' into develop