Signed-off-by: jobpassion <jobpassion@gmail.com>
Merge branch 'master' of https://github.com/jobpassion/GrabTheSofa

Conflicts:
	manifest.json
	valentine/cool.js

Signed-off-by: jobpassion <jobpassion@gmail.com>