Lalalala
Merge pull request #14 from cristianfernandez/master

Controller