updates
Merge branch 'master' of https://github.com/emorystrother/git_help

Conflicts:
	app/models/student.rb