ok
ok
okMerge branch 'master' of github.com:boufflGEpitech/lemipc

Conflicts:
	main.c