Master

Final delivery of the solution by group 16.