docs
Merge branch 'master' of github.com:Nozdi/shmir

Conflicts:
	api/README