changes changed directly on server, bad bad bad
migrated
update git ignore for server reasons, may need reverting later
Merge branch 'master' of github.com:FoodCircles/food_circles
Merge branch 'master' of github.com:FoodCircles/food_circles
Merge branch 'master' of github.com:FoodCircles/food_circles