Updated header and JavaDoc
Merge branch 'master' of github.com:dselman/tweetamo