Problem resolution: commit b4 update
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/com/example/tabsandtrack/R.java
Changed text of button to "Next"