init
Merge branch 'master' of github.com:dative/rose

Conflicts:
	README.md