Code and Database updated
Merge pull request #4 from anishta/master

Code and Database updated