add kiss heart
Merge branch 'master' of https://github.com/dan-boa/xtickme

Conflicts:
	public/js/test.js