finshed contour conflict resolution (still need to implement graphical display of contours)
Merge branch 'master' of github.com:wtrdrnkr/pyrecon
finished contour overlap resolution (still needs pictures of contours to display)