Initial branch merge to create server branch
Added the user modal to allow developers to talk to the user through a modal
Added generalized user messages.
the scheduler is now in a different file, and now removes the meal from the user's 'mealsAttending'
removing commented out code
changed the interval to be right before the minutes begin, so as to give a buffer
Merge pull request #102 from nfeliciano/schedulerChanges

scheduler changes
Merge pull request #100 from nfeliciano/user_help

seems to work
Merge branch 'master' into onlyOneMeal

Conflicts:
	app/client/js/controllers/main-controller.js