controller tests -five- and pulled edit to new page
Merge pull request #18 from smonette/controller_route_tests

controller tests -five- and pulled edit to new page