asset_crud
Fix conflict
Merge pull request #46 from jlrogee/task4

asset_crud