Merge branch 'gh-pages' of https://github.com/jtutuncumacias/foodCompass into gh-pages

Conflicts:
	index.html
attempt to fix merge conflicts