java string manipulation
Merge branch 'master' of https://github.com/nickfun/stuff