Pullsync
Fix
Merge branch 'master' of https://github.com/aleksanb/kink-demo

Conflicts:
	kink.js