Merged and integrated!!

Merged all the changes and integrated Devika’s code in the project
some more changes