ok modified gitignore
test
Merge branch 'master' of https://github.com/GustavePate/pyramidfront

Conflicts:
	pyramidfront/views/FoodSearch.pyc