orator design
Merge branch 'master' of https://github.com/khcr/resj

Conflicts:
	app/controllers/subjects_controller.rb
	app/views/orators/index.html.erb