init
Merge branch 'master' of github.com:lanbaba/ossync

Conflicts:
	README.md

	modified:   README.md