Updated images per discussions with Bill/Karen
Merge branch 'master' of https://github.com/dffrnt/CaptionAccess
Changes to integrate the new site with Grails
Content changes per Bill
Merge branch 'master' of https://github.com/dffrnt/CaptionAccess
Moved Vijay's Photoshop source out of the source code
https://captionaccess.atlassian.net/wiki/display/eng/2014.04.07.01+Website
Made images root relative so that they work from the grails site as well
Merge branch 'master' of https://github.com/dffrnt/CaptionAccess
Adding new photo for Collins per Bill
Merge branch 'master' of https://github.com/dffrnt/CaptionAccess

Conflicts:
	contact.html
	scripts.js
Made links root relative so that they work from the grails site as well