Merge branch 'hotfix-1.1.4' into live
Messed with opensearch link and updated google analytics info
Updating page.tpl.php to avoid conflicts on merge
Fixing merge issues with release-1.1.5 and page.tpl
Merge branch 'live' of github.com:FHCHS/library-site into live
Merged changes to page.tpl.php.  It had a number of conflicts between the two versions.  Make sure to do your work in the dev branch.
Merge branch 'release-1.1.6' into live
Still messing with page.tpl.php
Merge branch 'release-1.1.7' into live
Placing Qualtrics script into a block to get it off of anything other than the homepage
Placed qualtrics script into page.tpl.php when page--front.tpl.php didn't work.
Moving scripts around, fixed CSS for blocks
Merging hotfix-1.1.8a