controller testing
Merge pull request #21 from arieldiamond/scaffolding

controller testing