Merge branch '20141124-hours'
Thanksgiving alert
Merge branch 'thanksgiving'
Merge branch 'master' of github.com:ssu-library/library.working.dev
Added Woolsey interview
Merge branch 'Woolseyedit'
Removed Thanksgiving
Merge branch 'removethanksgiving'
Merge branch '20141105-journalissues'

Conflicts:
	index.php
Re-created robots.txt
Merge branch '20141105-journalissues'
Re-order date for issues list
Merge branch '20141105-journalissues'
Added new homepage image for relax campaign
Merge branch '20141204-homepageimage'
Merge branch '20141210-homepage-image' into staging