A bit more of the qs
Merge branch 'master' of https://github.com/segrahn/avalg

Conflicts:
	.classpath
	bin/Main.class
	src/Main.java