working logic and display for results.erb
Merge branch 'master' into second_branch