conflict correction
add dfs command to the Makefile
correct dfs command
add print_fs_info to the block header
add the print_fs_info to the block library
Merge branch 'develop' of https://github.com/Ath0m/ASE-TP07 into develop