added libraries
Merge branch 'master' of https://github.com/ArnauPrat/Sacman

Conflicts:
	lib/freeimage/include/FreeImage.h
	lib/sdl2/include/SDL_config.h