daily
daily
daily
daily
test git merge --squash daily
daily
test merge --squash after merge --squash
daily
dailly
daily
Merge branch 'daily'

Conflicts:
	_posts/test/2013-06-12-blog-PythonSf-calculations-on-editors.md
add style.css to assets