comit
Merge branch 'master' of https://github.com/zhanglun/hexo-theme

Conflicts:
	Tinny/source/css/_base/public.styl
	Tinny/source/css/_partial/aside.styl