layout
Merge branch 'master' of https://github.com/cgeidt/RoboControl.git

Conflicts:
	bin/classes/com/example/legoroboticcontroller/R$string.class
	bin/classes/com/example/legoroboticcontroller/R$style.class
	gen/com/example/legoroboticcontroller/R.java
	res/values/strings.xml