Added div_by_col() and div_by_row()
Resolve upstream conflicts hindering automatic merge
Merge pull request #10 from f0k/div-by-row

Added div_by_col() and div_by_row()