Merge pull request #5 from luminousfennell/tmp-servlet-lecture-2013-06-11-integration

Code from  lectures 2013-06-04 and 2013-06-11
generic parameter fixed