Working on teacher module
Adding extra fields
Resolving conflicts