First commit
Merge branch 'master' of github.com:gsmiro/quadro

Conflicts:
	LICENSE
	README.md

First commit