test
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/database.yml
test
schema.rb
123
add mailer and students page
Merge remote-tracking branch 'origin/master'