conflict 2
Merge branch 'master' of github.com:aptr322/rotary

Conflicts:
	README.md