Fix typo
Fix typo
Merge branch 'master' of github.com:danascheider/canto into not_passing
Merge branch 'master' of github.com:danascheider/canto into params_module
Resolve stupid merge conflict which is dumb because I wasn't even trying to merge
Merge branch 'master' of github.com:danascheider/canto into params_module
validate params before responding to requests
validate params before responding to requests
Remove 2 params helper methods that will be reincorporated as part of search resource later
Merge branch 'params_module' into not_passing