removing conflict markers
Merge branch 'chapter4_to_6'
Merge branch 'chapter7'
to kep the master updated