LOL
Merge branch 'master' of https://github.com/Ath0m/PDS-TP06

Conflicts:
	cmd.c