lineups now showing switches properly
Merge branch 'master' of https://github.com/evanwest/CS185_Project1.git

Conflicts:
	SeatRacing/src/edu/ucsb/cs/cs185/seatracing/LineupsTimerActivity.java