java code
Merge branch 'master' of https://github.com/stelee/mashup