feature #9 done
Story #10 Done
refactor lindo
Merge pull request #3 from sbogado/develop

Merge. Stories #9 and #10 implemented.