serge
Merge branch 'master' of github.com:charvoa/42
Merge branch 'master' of github.com:charvoa/42
Merge branch 'master' of github.com:charvoa/42

Conflicts:
	parser/struct_fill.c
serge
Merge branch 'master' of github.com:charvoa/42

Conflicts:
	env/prompt.c