Practical part of A and B done.. Started on practical part of C

Theoretical B2.2a+b done
Small conflict changes