Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorGustavo Martin Morcuende <gustavo.martin@scmspain.com>
Fri, 2 Dec 2016 21:00:36 +0000 (22:00 +0100)
committerGustavo Martin Morcuende <gustavo.martin@scmspain.com>
Fri, 2 Dec 2016 21:00:36 +0000 (22:00 +0100)

Trivial merge