First Real Commit

first real commit
Merge pull request #1 from AleOnRails/master

First Real Commit with the Alessandra's code