Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorgu.martinm@gmail.com <gu.martinm@gmail.com>
Wed, 8 Oct 2014 19:54:26 +0000 (21:54 +0200)
committergu.martinm@gmail.com <gu.martinm@gmail.com>
Wed, 8 Oct 2014 19:54:26 +0000 (21:54 +0200)

Trivial merge