Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Mon, 13 Oct 2014 00:36:37 +0000 (02:36 +0200)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Mon, 13 Oct 2014 00:36:37 +0000 (02:36 +0200)

Trivial merge