Controller commit
Merge pull request #3 from alepas92/feature/controllers

Controller commit