changes to the scanner and parser and adding a makefile