Make label more flexible
Merge branch 'master' of
https://github.com/estebanroblesluna/cupDraw.git

Conflicts:
	Figure/LabelFigure.j