Corrected the project

The project had stopped working. So some changes were made to make it
work again.
Conflict Resolve Attempt

Amruta has committed her changes. Some conflicts are being generated
because of it.
CR