App sync with backend
Merge branch 'gh-pages' of https://github.com/alignedcode/nescafe-promo into gh-pages

Conflicts:
	.DS_Store
	index.html
Merge branch 'gh-pages' of https://github.com/alignedcode/nescafe-promo into gh-pages

Conflicts:
	.DS_Store
	index.html