Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorgu.martinm@gmail.com <gu.martinm@gmail.com>
Mon, 26 May 2014 12:16:21 +0000 (14:16 +0200)
committergu.martinm@gmail.com <gu.martinm@gmail.com>
Mon, 26 May 2014 12:16:21 +0000 (14:16 +0200)

Trivial merge