added column reordering
Merge remote-tracking branch 'origin/master'
Added support files for colreorder
attempt to fix issues with line endings and git