bot client java and browser code
Merge branch 'master' of https://github.com/jwbowler/maslab-2014