update
update
Merge branch 'gh-pages' of https://github.com/xlgwr/iRobotUI into gh-pages

Conflicts:
	_layouts/default.html
	_posts/2013-01-12-hello-world-and-me.textile
	_posts/2013-01-12-觉而非觉悟,悟而常悟心.textile
update