Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Sun, 29 Jun 2014 02:10:39 +0000 (04:10 +0200)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Sun, 29 Jun 2014 02:10:39 +0000 (04:10 +0200)

Trivial merge