End of Monday 21 January
Trying to commit again
Deleted QLLexer and Parser
Some AST classes are refactored
Unit tests are updated
Grammar works
Last updates of 22 January Tuesday
Merge branch 'master' of https://github.com/software-engineering-amsterdam/sea-of-ql

Conflicts:
	TubaKaya/QLJava/.project
	TubaKaya/QLJava/src/org/uva/sea/ql/parser/antlr/QLLexer.java
	TubaKaya/QLJava/src/org/uva/sea/ql/parser/antlr/QLParser.java

rm commit
Prima
Merge branch 'master' of https://github.com/software-engineering-amsterdam/sea-of-ql

Conflicts:
	christoswax/QLjava/src/org/uva/sea/ql/ast/expression/Not.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/And.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/Eq.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/GEq.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/GT.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/LEq.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/LT.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/NEq.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/Not.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/bool/Or.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/math/Add.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/math/Div.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/math/Mul.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/math/Neg.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/math/Pos.java
	ckonig/QLJava/src/org/uva/sea/ql/ast/math/Sub.java
	ckonig/QLJava/src/org/uva/sea/ql/interpreter/HTMLVisitor.java
	ckonig/QLJava/src/org/uva/sea/ql/parser/antlr/QL.g
	ckonig/QLJava/src/org/uva/sea/ql/parser/antlr/QLLexer.java
	ckonig/QLJava/src/org/uva/sea/ql/parser/antlr/QLParser.java
	gonzovilla/src/org/uva/sea/ql/ast/expr/Expr.java
	gonzovilla/src/org/uva/sea/ql/ast/expr/Ident.java
	jahnestacado/QLJava/src/org/uva/sea/ql/ast/form/Body.java
	jahnestacado/QLJava/src/org/uva/sea/ql/parser/antlr/QLLexer.java
	jahnestacado/QLJava/src/org/uva/sea/ql/parser/antlr/QLParser.java
	jahnestacado/QLJava/src/org/uva/sea/ql/parser/test/TestForm.java
	pklijn/src/org/uva/sea/ql/ast/Binary.java
	pklijn/src/org/uva/sea/ql/ast/Eq.java
	pklijn/src/org/uva/sea/ql/ast/Int.java
	pklijn/src/org/uva/sea/ql/ast/Mul.java
	pklijn/src/org/uva/sea/ql/ast/Not.java
	pklijn/src/org/uva/sea/ql/ast/Pos.java
	pklijn/src/org/uva/sea/ql/ast/StringNode.java
	pklijn/src/org/uva/sea/ql/ast/Sub.java
	pklijn/src/org/uva/sea/ql/ast/Unary.java
	pklijn/src/org/uva/sea/ql/ast/expressions/Bool.java
	pklijn/src/org/uva/sea/ql/ast/expressions/binary/Add.java
	pklijn/src/org/uva/sea/ql/ast/expressions/binary/And.java
	pklijn/src/org/uva/sea/ql/ast/expressions/binary/Div.java
	pklijn/src/org/uva/sea/ql/ast/expressions/binary/GEq.java
	pklijn/src/org/uva/sea/ql/ast/expressions/binary/GT.java
	pklijn/src/org/uva/sea/ql/ast/expressions/binary/LEq.java
	pklijn/src/org/uva/sea/ql/ast/expressions/binary/LT.java
	pklijn/src/org/uva/sea/ql/ast/expressions/binary/Or.java
	pklijn/src/org/uva/sea/ql/ast/types/BoolType.java
	pklijn/src/org/uva/sea/ql/ast/types/IntType.java
	pklijn/src/org/uva/sea/ql/ast/types/StringType.java
	pklijn/src/org/uva/sea/ql/ast/types/Type.java
	pklijn/src/org/uva/sea/ql/ast/values/BoolValue.java
	pklijn/src/org/uva/sea/ql/ast/values/IntValue.java
	pklijn/src/org/uva/sea/ql/ast/values/StringValue.java
	pklijn/src/org/uva/sea/ql/parser/antlr/QLLexer.java
	pklijn/src/org/uva/sea/ql/parser/antlr/QLParser.java
	pklijn/src/org/uva/sea/ql/parser/test/TestExpressions.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/Form.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/Ident.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/Int.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/Neg.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/Pos.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/Question.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/Statement.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/Add.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/And.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/Binary.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/Div.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/Eq.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/GEq.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/GT.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/LEq.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/LT.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/Mul.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/NEq.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/Or.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/Sub.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/expr/Unary.java
	renetassy/QLJava/src/org/uva/sea/ql/ast/stmnt/Body.java
	renetassy/QLJava/src/org/uva/sea/ql/parser/antlr/ANTLRParser.java
	renetassy/QLJava/src/org/uva/sea/ql/parser/antlr/QL.g
	renetassy/QLJava/src/org/uva/sea/ql/parser/antlr/QL.tokens
	renetassy/QLJava/src/org/uva/sea/ql/parser/antlr/QLLexer.java
	renetassy/QLJava/src/org/uva/sea/ql/parser/antlr/QLParser.java
	renetassy/QLJava/src/org/uva/sea/ql/parser/test/FReader.java
	renetassy/QLJava/src/org/uva/sea/ql/parser/test/IParse.java
	renetassy/QLJava/src/org/uva/sea/ql/parser/test/TestExpressions.java
	renetassy/QLJava/src/org/uva/sea/ql/parser/test/TestForms.java
	renetassy/QLJava/src/org/uva/sea/ql/parser/test/sample.ql
	sven-m/QLJava2/src/org/uva/sea/ql/ast/Expr.java