Wednesdays work
Merge branch 'master' of https://github.com/debtice/DinerDollars

Conflicts:
	app/controllers/enrollments_controller.rb
	app/models/user.rb
	app/views/enrollments/index.html.erb
Worked on enrolled table and calculations