rspec files will now pass
adding some ruby
Merge branch 'master' of https://github.com/whyu/wdi_project_2
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
updating controller
layout, bootstrap, legend
update
updated controller