Commit inicial
Merge branch 'master' of github.com:cherra/bijou

Conflicts:
	README.md