-Added field ordering
Merge branch 'master' of github.com:phile314/mcco-projects

Conflicts:
	project1/src/Bibtex/Basic.hs
	project1/src/Bibtex/Gen.ag
-Add a more complicated bibtex file