backend crud
fixed merge
Merge pull request #2 from rarice4/master

added crud and fixed merge error