finally got this back to close-to-normal. ,,|,, git
aldksfjadslfj
Merge branch 'master' of https://github.com/jonathanhamm/pascalcompiler

Conflicts:
	firfoll
	lex.h
	machines.h
	pc
	pc.dSYM/Contents/Resources/DWARF/pc
	ptable
	ptablegen.c
	samples/attgrammar
	samples/attgrammar_toklist
	samples/attribtest
	samples/attribtest_toklist
	samples/attribtestlisting
	samples/pascal_toklist
	samples/proj1.dSYM/Contents/Info.plist
	samples/proj1.dSYM/Contents/Resources/DWARF/proj1
	samples/proj1.dSYM/attgrammar
	samples/synerrortestlisting
	samples/workingtest_toklist
afj;afjka;slkdfj;asdfj
a;dfja