EXE's
Merge branch 'master' of https://github.com/ScilicetIngeniarius/imagelib

Conflicts:
	Proyecto/include/image.hh
	Proyecto/src/image.cpp