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

This reverts commit c2b5630c238245f1f8464538eb138e6302d73649, reversing
changes made to 340b29ef0fa574c4b257d170c89efecb2e8d681c.

Conflicts:
	app/models/student.rb
trying to get to right version
Revert "RaghuMeetingTake2!"

This reverts commit 21435be3be86acf2477750b6114ce3ff8c38faa9.

Conflicts:
	app/models/student.rb