added switching logic + highlight (not currently reflected in text)
Merge branch 'master' of https://github.com/evanwest/CS185_Project1.git

Conflicts:
	SeatRacing/res/values/strings.xml
	SeatRacing/src/edu/ucsb/cs/cs185/seatracing/model/Round.java