Draft proposal
Merge remote-tracking branch 'upstream/master'

Conflicts:
	report/proposal/proposal.tex
Feature extractors for budget and release dates
Merge pull request #8 from beets/master

Feature extractors for budget and release dates