Forgot to commit this
Merge branch 'master' into uuagc

Conflicts:
	project1/src/Bibtex.hs