Commit before pull
Merge branch 'master' of https://github.com/wlorin/sae2

Conflicts:
	src/ch/ethz/sae/Analysis.java