Im a noob -_-
Merge branch 'master' of https://github.com/exasky/DualPong

Conflicts:
	src/com/ups/dualpong/MainActivity.java
f