adding friendly id for venues
adding weekly meal goals
spacing content for new header
adding login links
Merge branch 'master' of github.com:FoodCircles/food_circles
trying to merge changes
Merge branch 'master' of https://github.com/Siesna/food_circles

Conflicts:
	log/development.log
importing scripts from most recent homepage
Merge branch 'master' of https://github.com/FoodCircles/food_circles
importing colorbox into homepage javascript
updating home page
Adding texting functions
add code for texting link to app