work on resource
Merge branch 'master' of github.com:junglefresh/Shiva.io