Harshith's code
Merge branch 'master' of https://github.com/NightsWatch/compilers-lab

Conflicts:
	Assignment-3/parser.cpp
free of merging problems?
changed grammar.txt