budget show added
Merge branch 'master' into david
working out users bugs
Merge pull request #11 from natewinn/david

David