Buttons to Switch Units
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/unitapp/MainActivity.class
	bin/classes/com/example/unitapp/R$id.class
	bin/classes/com/example/unitapp/R$layout.class
	bin/classes/com/example/unitapp/R$menu.class
	bin/classes/com/example/unitapp/R$string.class
	bin/classes/com/example/unitapp/R$style.class
	gen/com/example/unitapp/R.java
	res/layout/activity_main.xml