replace entry classa
Merge branch 'master' of https://github.com/gshakhn/lambdajam2013
Linking everything together