Fixed some issues
Merge branch 'master' of https://github.com/person594/cs153

Conflicts:
	scc1401/src/retree/RetreeUtils.java
	scc1401/src/retree/expression/Expression.java
	scc1401/src/retree/expression/VariableExpression.java