stuff
Merge branch 'master' into david
fixed budgetscontroller
fixed views folders, navbar
Merge pull request #6 from natewinn/david

David