Updated 2014 Site
cname
Merge branch 'gh-pages' of github.com:diversitywoman/conference2014

Conflicts:
	_includes/nav.html
	_layouts/default.html
	_site/Anise-D.-Wiley-Little/index.html
	_site/Candi-castleberry/index.html
	_site/Dagit_Deborah/index.html
	_site/Edie-Fraser/index.html
	_site/Frank-McCloskey/index.html
	_site/Jackie-Glenn/index.html
	_site/Rosalind-Hundell/index.html
	_site/Shari-Slate/index.html
	_site/Sheila-Robinson/index.html
	_site/Shirley-Davis/index.html
	_site/Steve-Pemberton/index.html
	_site/Sylvia-Hewlett/index.html
	_site/Tena-Clark/index.html
	_site/Tyronne-Stoudemire/index.html
	_site/assets/images/disney.jpg
	_site/assets/images/hero.jpg
	_site/audra-bohannon/index.html
	_site/index.html
	_site/page2/index.html
	_site/page3/index.html
	_site/page4/index.html
	assets/images/disney.jpg
	assets/images/hero.jpg