Join Testbranch with Master

Finnished the first part of the assignment.