Adding project 2
Merge branch 'master' of github.com:akiress/compilers

Conflicts:
	prog2/Makefile
	prog2/Parse/Grm.cup
	prog2/Parse/Grm.err
	prog2/Parse/Grm.java
	prog2/Parse/sym.java