Merge pull request #1 from hansliu/master

updated
updated
Merge branch 'v3' of github.com:hansliu/hansliu-theme into v3

Conflicts:
	templates/base.html
	templates/base.html.old