resources page
resources page changes
Merge branch 'issue-30' into develop