htaccess edit
Merge branch 'quickfix'

Conflicts:
	.htaccess
Merge branch 'master' of github.com:ssu-library/library.working.dev

Conflicts:
	.htaccess
Merge branch 'staging'
Corrected the EBSCO search box on research page
Merge branch 'EBSCO-Search-Fix' into staging