updates
Merge branch 'master' of github.com:siscjournal/resources
updates