almost finish
Merge branch 'master' of https://github.com/pgarcia041993/deleaves

Conflicts:
	app/views/students/show.html.erb
Merge branch 'master' of https://github.com/pgarcia041993/deleaves

Conflicts:
	app/views/students/show.html.erb