edit test
edit test bin
Merge branch 'master' of https://github.com/majikarusashimi/CS2112-a4

Conflicts:
	.classpath

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui
.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.pre
fs
	.metadata/.plugins/org.eclipse.jdt.core/2432857756.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.project
	bin/student/BinaryConditionOperator.class
	bin/student/BinaryOp.class
	bin/student/Condition.class
	bin/student/ErrorToken.class
	bin/student/Expression.class
	bin/student/Node.class
	bin/student/Num.class
	bin/student/NumToken.class
	bin/student/Parser.class
	bin/student/ParserFactory.class
	bin/student/ParserImpl.class
	bin/student/Program.class
	bin/student/Rule.class
	bin/student/SyntaxError.class
	bin/student/Token.class
	bin/student/Tokenizer.class
	bin/student/example-rules.txt
	src/student/BinaryCondition.java
	src/student/BinaryConditionOperator.java
	src/student/BinaryOp.java
	src/student/Condition.java
	src/student/ErrorToken.java
	src/student/Expression.java
	src/student/Node.java
	src/student/Num.java
	src/student/NumToken.java
	src/student/Parser.java
	src/student/ParserFactory.java
	src/student/ParserImpl.java
	src/student/Program.java
	src/student/Rule.java
	src/student/SyntaxError.java
	src/student/Token.java
	src/student/Tokenizer.java
	src/student/example-rules.txt
test edit
test edit bin