delete and edit students
Merge branch 'master' of https://github.com/brianyingling/gradr

Conflicts:
	app/views/klasses/_index.html.haml

resolving merge conflicts
Merge branch 'master' of https://github.com/brianyingling/gradr

merge conflicts resolved