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

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