exercise #10
Merge github.com:NineInchNade/student-directory

Conflicts:
	directory.rb