dflgkj
Merge branch 'master' of https://github.com/closingin/epitech-rush

Conflicts:
	epic_editor/main.c
Merge remote-tracking branch 'origin/master'
sfkgj