Ooops
Fixed conflict on README
Merge pull request #6 from I3G-Carlos/branch2

Hehehe