Completed code part of assignments
Codebook included
Fixmed merge conflict