Gem format
Merge branch 'master' of github.com:mrodrigues/teacher

Conflicts:
	lib/teacher.rb