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

Conflicts:
	javascripts/search.js
merge conflict