merging with andrea
Merge pull request #17 from simensta/finishing-crud

merging with andrea