validations, edit & delete
Conflict resolved
Merge pull request #11 from niravpatel2008/aniket

validations, edit & delete