Add back programme and team sections
Merge branch 'gh-pages' of github.com:lyonrb/railsgirls2014 into gh-pages

Conflicts:
	_includes/programme.html
	index.html