Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorGustavo Martin Morcuende <gustavo.martin@scmspain.com>
Thu, 24 Nov 2016 00:56:56 +0000 (01:56 +0100)
committerGustavo Martin Morcuende <gustavo.martin@scmspain.com>
Thu, 24 Nov 2016 00:56:56 +0000 (01:56 +0100)

Trivial merge