Master version

This is the mastr version of the homework