recorrect
Merge branch 'two_types_correct'

Conflicts:
	lib/citier/core_ext.rb