costma
ocr_pso
Merge remote-tracking branch 'origin/move_to_ruby' into move_to_ruby

Conflicts:
	dfa_pso.rb