juh
Merge branch 'master' of https://github.com/marcelfarres/geocomp-proj

Conflicts:
	edgeError.cpp
iurhgrsh
still not working