removing temporary files from version control
Merge branch 'master' of github.com:FoodCircles/food_circles

Conflicts:
	log/development.log
	log/staging.log