1
1
Merge branch 'blog' into gh-pages

Conflicts:
	blog/css/g.css
	blog/data/data.json
	blog/html/1_home.html
	blog/html/2_protfolio.html
	blog/html/3_protfolio_c.html
	blog/html/4_blog.html
	blog/html/5_blog_c.html
	blog/image/arrow.jpg
	blog/image/blank.jpg
	blog/image/hover.png
	blog/image/logo.jpg
	blog/image/logo_small.jpg
	blog/image/saw.jpg
	blog/image/search.jpg
	blog/index.html
	blog/js/handlebars.js
	blog/js/jquery-2.0.3.min.js
	blog/js/jquery.bxslider.min.js
	blog/js/waterfall.min.js
	blog/shtml/1_home.shtml
	blog/shtml/2_protfolio.shtml
	blog/shtml/3_protfolio_c.shtml
	blog/shtml/4_blog.shtml
	blog/shtml/5_blog_c.shtml
	blog/shtml/inc/_head.shtml
	blog/shtml/inc/_link_g.shtml
	blog/shtml/inc/blogCard.shtml
	blog/shtml/inc/commentForm.shtml
	blog/shtml/inc/commentMain.shtml
	blog/shtml/inc/latestComment.shtml
	blog/shtml/inc/latestPost.shtml
	blog/shtml/inc/pageFoot.shtml
	blog/shtml/inc/pageHead.shtml
	blog/shtml/inc/protfolioCard.shtml
	blog/shtml/inc/siteSide.shtml
	index.html
	src/js/jquery-2.0.3.min.js
	src/js/jquery.bxslider.min.js
	src/shtml/inc/_head.shtml
	wx/js/jquery-2.0.3.min.js
	wx/js/jquery.bxslider.min.js
	wx/shtml/inc/_head.shtml