Merge branch 'NOLA-2013'
Modifying for Bar Harbor trip!
Merge branch 'BARHARBOR-2013' into gh-pages

Conflicts:
	css/style.css
	img/Dan Munz is back in the office.ics
	index.html