add dist
test php
Merge branch 'b1'

Conflicts:
	dist/index.html
Merge branch 'b1'
Merge branch 'b1'
Merge branch 'b1'
update dist
add 404, basic schedule
delete <p> in talks/*/index.jade, use % width