Merge pull request #86 from jkuk/master

committee
Merge pull request #87 from jkuk/master

one too many periods
implementing budget tables
Merge remote-tracking branch 'upstream/master'