deleted:    gpc.py
	deleted:    PCAT-syntax-EBNF
	deleted:    README.md
	deleted:    PCAT-syntax-EBNF
	deleted:    README.md
	new file:   Makefile
	new file:   README.md
	new file:   Report_compile.pdf
	new file:   basic.cc
	new file:   basic.h
	new file:   basic.templates
	new file:   lexer
	new file:   main.cc
	new file:   pcat.lex
	new file:   pcat.yy.c
	new file:   tests/test01.pcat
	new file:   tests/test02.pcat
	new file:   tests/test03.pcat
	new file:   tests/test05.pcat
	new file:   tests/test07.pcat
	new file:   tests/test08.pcat
	new file:   tests/test12.pcat
	new file:   tests/test15.pcat
	new file:   tests/test16.pcat
	new file:   tests/test17.pcat
	new file:   tests/test19.pcat
	new file:   tests/test20.err
	new file:   tests/test20.pcat
file move
remove tmp file
.gitignore added
Merge branch 'c-version-modified' into c-version

Conflicts:
	lexer
	main.cc
	pcat.lex
	pcat.yy.c
	tests/test01.pcat
	tests/test02.pcat
	tests/test05.pcat