no message
Merge branch 'master' of https://github.com/strujillojr/Wishlist

Conflicts:
	injected.js