javadoc finished
querygenerator split up to make it more easily readable

todo: separate exercise 1 and 2