join activity layout
Merge branch 'master' of https://github.com/exasky/DualPong