ok
Merge branch 'master' of https://github.com/KitWong/KitWong.github.io

Conflicts:
	demo/layout/layout-2-cols.css
update