couple of additions
Merge branch 'master' of https://github.com/mcdickenson/whistle

Conflicts:
	master.bib