updates in hw_6 (final version) + first commit hw_7 (works fine, and makefile missing)