second try
Merge github.com:mer567/assignment6