added top100words method. renamed a couple variables
merged conficts (hopefully)