readme
Merge branch 'master' of https://github.com/bipio-server/bipio

Conflicts:
	README.md