User can edit number
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/unitapp2/MainActivity$1.class
	bin/classes/com/example/unitapp2/MainActivity$2.class
	bin/classes/com/example/unitapp2/MainActivity$3.class
	bin/classes/com/example/unitapp2/MainActivity$4.class
	bin/classes/com/example/unitapp2/MainActivity.class
	res/layout/activity_main.xml