Initial commit
first commit - project working
fixed conflict
fixed conflict
updated readme.md
updated readme.md
Merge pull request #1 from camilolopes/master

first commit