Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorgu.martinm@gmail.com <gu.martinm@gmail.com>
Sun, 30 Mar 2014 04:14:10 +0000 (06:14 +0200)
committergu.martinm@gmail.com <gu.martinm@gmail.com>
Sun, 30 Mar 2014 04:14:10 +0000 (06:14 +0200)

Trivial merge