tweeked controller and view
tweeked controller and index erb
resolved merge conflicts