Merge pull request #1 from marmikpatel/master

updating my branch
commiting new code
deleting files
commiting fixtures code
commiting code of fixture
commiting new and modified files of fixtures
commit
modified code
Merge pull request #3 from Bhumika-Kacha/master

updating my branch