Display, function testing
Merge branch 'master' of https://github.com/ScilicetIngeniarius/imagelib

Conflicts:
	Proyecto/test/Makefile
Merge branch 'master' of https://github.com/ScilicetIngeniarius/imagelib