Update Cangibrina
Merge branch 'master' of github.com:fnk0c/cangibrina

Conflicts:
	README.md