Adding new classromm form
Added new classroom view
Resolved conflicts