Merge pull request #20 from arieldiamond/scaffolding

completed scaffolding
Merge pull request #21 from arieldiamond/scaffolding

controller testing
Merge pull request #22 from arieldiamond/scaffolding

controller testing
Merge pull request #23 from arieldiamond/scaffolding

Scaffolding
added changes to be able to deploy to heroku
Merge branch 'master' into scaffolding