added show student page
Fixed merge conflict index.html.erb & routes config file
Merge branch 'master' of github.com:makersacademy/student-directory