Added words to dictionary
Merged conflicting files