changed @author
Merge branch 'master' of https://github.com/RubySmith/JavaTheHutt