Things and stuff.
Merge branch 'master' of https://github.com/Mrkol/RoboMobo

Conflicts:
	res/layout/main.xml