)
Merge branch 'master' of https://github.com/gena-admin/blog

Conflicts:
	app/models/department.rb
	app/models/teacher.rb
	config/database.yml.example
	db/migrate/20130403183313_create_teachers.rb
	spec/factories/departments.rb
	spec/factories/teachers.rb
	spec/models/department_spec.rb
	spec/models/teacher_spec.rb