added Bresenham for 2D
merged master