Upload
Merge remote-tracking branch 'origin/master'

Conflicts:
	EDAF10/labbar/expr/Conjunction.java
	EDAF10/labbar/expr/Disjunction.java
	EDAF10/labbar/expr/Implication.java