Allow syncing features
Merge branch 'master' of github.com:fd/forklift

Conflicts:
	README.md