Merge branch 'master' of C:\Users\berossm\RubymineProjects\MealPlanner with conflicts.
Merge remote-tracking branch 'origin/master'
Added UserSession model and changed user logic to use new model.
Added documentation.