Changes in controller
Added student search facility
Conflict resolved