controllers created
resolve merge conflict
Merge pull request #5 from ricarora/controller-create

Controller create