add views
add views
git's weird
Merge remote-tracking branch 'origin/views-edit-2'

Conflicts:
	app/controllers/student_controller.rb
	app/views/show.erb
Buttons on show page