worked on JUnit tests for Entry

Renamed WordTest to EntryTest, then did the JUnit tests for the Entry
constructor and the addOccurrences method.
Merged changes

Merged conflicts between local and remote version, this included 
changing the name of getWME to getEntry in Entry class. Also merged 
differences between JUnit tests
Merged and fixed conflicts

Fixed conflicts between remote and local copies of Entry, including
changing the remote method getWME() to getEntry within Entry Class.  
Also successfully merged changes to JUnit tests for Entry and 
Dictionary.