obliger
Merge branch 'master' of https://github.com/boufflGEpitech/lemipc

Conflicts:
	Makefile
	display.c