pulling to test profile
fix conflicts part 2
Fixing conflicts in about page and landing page
multiple page functionality for resources
Resolving conflicts on resource.show page
added bookmarks button to show resource page
fixing merge conflicts