Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorgu.martinm@gmail.com <gu.martinm@gmail.com>
Mon, 16 Jun 2014 00:59:10 +0000 (02:59 +0200)
committergu.martinm@gmail.com <gu.martinm@gmail.com>
Mon, 16 Jun 2014 00:59:10 +0000 (02:59 +0200)

Trivial merge