2 commits

Author	SHA1	Message	Date
Jack Halford	c04006a471	fixed some merging problems : it compiles now	2017-02-20 22:41:02 +01:00
ariard@student.42.fr	490f81ee23	exec if + elif + else ok to-do:syntax error	2017-02-06 19:48:17 +01:00