*
Merge branch 'master' of https://github.com/jack0lantern/Awesomifier

Conflicts:
	product.js