First commit
Added README
Solved merge
Merge pull request #5 from acelaya/dev

Dev