git ignore
Merge branch 'gh-pages' of github.com:diversitywoman/conference2014 into gh-pages