Finished Scanner and Parse tree
Merge branch 'master' of https://github.com/Ofek86/CS152Assignment

Conflicts:
	Interpreter/src/intermediate/ParseTree.java
Merge branch 'master' of https://github.com/Ofek86/CS152Assignment

Conflicts:
	Interpreter/src/intermediate/ParseTree.java