testing coffee
Merge branch 'lab2' of https://github.com/bxdpxndx/geometria-computacional into lab2

Conflicts:
	lab2/Makefile
	lab2/build/delaunay.js