update config
update
new post
Merge branch 'source' of github.com:lenciel/lenciel.github.com into source

Conflicts:
	.gitignore
	_config.yml
	_deploy/atom.xml
	_deploy/blog/categories/blog/atom.xml
	_deploy/blog/categories/configuration/atom.xml
	_deploy/blog/categories/github/atom.xml
	_deploy/blog/categories/octopress/atom.xml
	_deploy/blog/categories/osx/atom.xml
	_deploy/blog/categories/rants/atom.xml
	_deploy/blog/categories/rss/atom.xml
	_deploy/blog/categories/server/atom.xml
	_deploy/blog/categories/software-engineering/atom.xml
	_deploy/blog/categories/thougts/atom.xml
	_deploy/blog/categories/tips/atom.xml
	_deploy/blog/categories/tool/atom.xml
	_deploy/blog/categories/tools/atom.xml
	_deploy/blog/categories/tutorial/atom.xml
	_deploy/blog/categories/tutorials/atom.xml
Site updated at 2013-06-29 16:07:28 UTC
manually merge
Site updated at 2013-06-29 16:09:58 UTC
revert gitignore
Site updated at 2013-06-29 16:12:57 UTC