fix bug: can not show comfortable
fix conflicts
add 10141117 blog about treap
update blog content 20141117
add picture in 20141117 blog