Merge pull request #7 from abcm1989/master

fixed merge conflicts and CRUD for snippet model