add JavaGenerics.java
Merge branch 'master' of git@github.com:davejagoda/Proggy