Added two new instructors
Merge branch 'gh-pages' of github.com:swcarpentry/2013-09-21-waterloo into gh-pages

Conflicts:
	index.html