Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Mon, 5 Dec 2016 21:18:14 +0000 (22:18 +0100)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Mon, 5 Dec 2016 21:18:14 +0000 (22:18 +0100)

Trivial merge