dist
New timeline stylesheet
marginally less intrusive column master
Merge branch 'master' of git://github.com/johnshopkins/machado

Conflicts:
	dist/css/ie7.css.map
	dist/css/main.css.map
	dist/js/home.js
	dist/js/page.js