adds first quiz challenge
moves some files around
fixes remote merge conflicts