adding project name to local runs
rearranging controller.rb
Merge branch 'master' into garora_project_name
fixing tests
made test more specific
Merge branch 'master' into garora_project_name
Merge branch 'master' into garora_project_name
Merge pull request #225 from mortardata/garora_project_name

[80700948]Garora project name