Simplify budget / assumptions data format
Merge branch 'master' of github.com:kolemannix/edu-

Conflicts:
	resources/public/js/models.js

God forgive me