might be messing stuff up....
Updated built site from 'source' - 228480194bfa3ee6b67ec8e639d026973bcaf5e4
add a bunch of files
Merge branch 'biblio'

Conflicts:
	2010/08/23/internet-censorship-in-Turkey/index.html
	2011/01/19/Edinburgh-Meeting-Notes-2/index.html
	2011/03/30/The-Lucky-Few-of-Waterloo-does-the-Perimeter-Institute-deserve-$50M-times-two/index.html
	2012/02/08/(guest-post)-Neil-Turok-Responds-to-Posts-on-Perimeter-Institute/index.html
	2012/02/09/Web-Course-Platform-Prototyped-by-Toronto-Mathematician/index.html
	2012/03/13/I-A-S-Workshop-on-Symplectic-Dynamics-2-Monday/index.html
	2012/03/15/I-A-S-Workshop-on-Symplectic-Dynamics-2-Thursday/index.html
	2012/03/17/I-A-S-Workshop-on-Symplectic-Dynamics-2-Friday/index.html
	2012/04/06/A Report-on-the-2012-N-S-E-R-C-Discovery-Grants-Results-for-Toronto-Math/index.html
	2012/08/16/Canada-Restricts-Athlete-Participation-To-One-Olympic-Games-per-Lifetime/index.html
	2012/09/07/On-Todays-N-S-E-R-C-Contact-Newsletter-Item-Regarding-Postdocs/index.html
	2012/09/11/Canada-is-Retreating-from-Investment-in-Science-and-Engineering/index.html
	2013/02/11/Larry-Guth-Colloquium-Video-Unexpected-applications-of-polynomials-in-combinatorics/index.html
	2013/03/21/Zaher-Hani-A-continuum-large-box-limit-for-the-cubic-nonlinear-Schrödinger-equation/index.html
	2013/05/08/University-of-Toronto-Math-Department-Colloquium-Videos-Winter-2013/index.html
	about/index.html
	legal/index.html
	publications/index.html
	publications/template.html
	publications/template2.html
	research/index.html
	service/index.html
	teaching/index.html
Merge branch 'master' of https://github.com/colliand/colliand.github.com

Conflicts:
	2010/08/23/internet-censorship-in-Turkey/index.html
	2011/01/19/Edinburgh-Meeting-Notes-2/index.html
	2011/03/30/The-Lucky-Few-of-Waterloo-does-the-Perimeter-Institute-deserve-$50M-times-two/index.html
	2012/02/08/(guest-post)-Neil-Turok-Responds-to-Posts-on-Perimeter-Institute/index.html
	2012/02/09/Web-Course-Platform-Prototyped-by-Toronto-Mathematician/index.html
	2012/03/13/I-A-S-Workshop-on-Symplectic-Dynamics-2-Monday/index.html
	2012/03/15/I-A-S-Workshop-on-Symplectic-Dynamics-2-Thursday/index.html
	2012/03/17/I-A-S-Workshop-on-Symplectic-Dynamics-2-Friday/index.html
	2012/04/06/A Report-on-the-2012-N-S-E-R-C-Discovery-Grants-Results-for-Toronto-Math/index.html
	2012/08/16/Canada-Restricts-Athlete-Participation-To-One-Olympic-Games-per-Lifetime/index.html
	2012/09/07/On-Todays-N-S-E-R-C-Contact-Newsletter-Item-Regarding-Postdocs/index.html
	2012/09/11/Canada-is-Retreating-from-Investment-in-Science-and-Engineering/index.html
	2013/02/11/Larry-Guth-Colloquium-Video-Unexpected-applications-of-polynomials-in-combinatorics/index.html
	2013/03/21/Zaher-Hani-A-continuum-large-box-limit-for-the-cubic-nonlinear-Schrödinger-equation/index.html
	2013/05/08/University-of-Toronto-Math-Department-Colloquium-Videos-Winter-2013/index.html
	about/index.html
	legal/index.html
	publications/index.html
	publications/template.html
	publications/template2.html
	research/index.html
	service/index.html
	teaching/index.html