Merge remote-tracking branch 'origin/Ericka' into Ericka
Merge pull request #10 from jonavargas/Ericka

Merge remote-tracking branch 'origin/Ericka' into Ericka