tweeked controller and view
tweeked controller and index erb
resolved merge conflicts
merge master
Merge pull request #5 from vyash8/alex

merge master
updated conflicts