controller testing
Merge pull request #22 from arieldiamond/scaffolding

controller testing