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

Conflicts:
	demo/weekend/css/weekend.css