Macking of fini
Merge branch 'master' of https://github.com/Heymile/wkid03-skeleton

Conflicts:
	_asset/css/style.css
Merge branch 'master' of https://github.com/Heymile/wkid03-skeleton