adding method to check for if a user has uploaded a meal today, drying up views
clearing merge conflict in users show
editing user.check_for_meal_today method to use correct dates
moved pry out of development to general gems
cleaning up layouts
moving logic in companies/index view to CompaniesHelper
Merge pull request #1 from alexshook/development

Development