test to comflict
Merge branch 'master' of https://github.com/juransaber/motion_stance

Conflicts:
	README.md