removed my conflicts. SHA hash might cause trouble. ignore it.
removied unused array
tried to implement merge. please check for correctness
started working on it. added some (hopefully) helpful comments
unnecessary stuff?
added a todo
Merge remote-tracking branch 'refs/remotes/origin/Andrea'
Started working on the project. Stopped at flowThrough. huehuehue
i have no idea...
worked on binary expressions. need to finish division.
finished division. made prettier functions.
deleted comment
Added divide,mult, modulo functions to the Interval function pool
Merge remote-tracking branch 'refs/remotes/origin/DuckTape'

Conflicts:
	bin/ch/ethz/sae/Analysis.class
	bin/ch/ethz/sae/Interval.class
	src/ch/ethz/sae/Analysis.java
	src/ch/ethz/sae/Interval.java
delete binary files
ignore class files
started to implement AND on intervals