merge
merge
Merge origin/master

Conflicts:
	src/node/Conditional.java
Merge origin/master
Merge origin/master

Conflicts:
	test/ParserTest.java
Merge origin/master

Conflicts:
	test/ParserTest.java
Merge origin/master

Conflicts:
	test/ParserTest.java
Merge origin/master

Conflicts:
	test/ParserTest.java
Merge origin/master

Conflicts:
	.gitignore
	src/node/Equal.java
Merge origin/master
Merge origin/master

Conflicts:
	.gitignore
	src/node/Equal.java