Merge branch 'testing' into model-testing
added routes #1
Merge branch 'resources', remote-tracking branch 'origin' into testing
refined routes, added empty controllers
Added views and controllers for each model.
removed test method