htaccess edit
Dev branch branch 'dev' of github.com:ssu-library/library.working.dev into dev
Updates from merging master --> dev
Changes to Felicia's profile
Changes to Research Guides
Research Guide testing
Resarch Guide rollback
Rollback research guides
Added the expandable research guides
Merge branch 'research_guides' into staging
Merge branch 'dev' into staging

Conflicts:
	research/guides/index.php
Merge branch 'staging'