Merge pull request #740 from matthewstyler/master

Fixes #716 remove redundant type params

exercises/word-count/src/example/java/WordCount.java

 public class WordCount {
 
     public Map<String, Integer> phrase( String input ) {
-        Map<String, Integer> countMap = new HashMap<String, Integer>();
+        Map<String, Integer> countMap = new HashMap<>();
         input = input.trim().toLowerCase().replaceAll("[\\W]", " ");
         final String[] tokenizedInput = input.split("\\s+");
         for( String aWord : tokenizedInput ) {

exercises/word-count/src/test/java/WordCountTest.java

     @Before
     public void setup() {
         wordCount = new WordCount();
-        expectedWordCount = new HashMap<String, Integer>();
+        expectedWordCount = new HashMap<>();
     }