added quiz2 + moved some output data around
resolved a merge conflict