fixed 2D collision (according to my three test cases)
cases: hcol.txt, vcol.txt, dcol.txt
ready to merge w/ master