mexericos
Merge branch 'master' of https://github.com/joao-o/prjprog
UI adjustments
Merge branch 'master' of ssh://169.254.6.176/home/joao/prjrepo

Conflicts:
	callbacks.c
	prjcairo.c
UI Improvements