Merge branch 'develop'

A lot of work have been done
Merge branch 'develop'

Final version of lab3.
Merge branch 'master' into develop
Fixed possible print bug