fixed showing switches in lineups frag, added toString's
stupid merge req
Merge branch 'master' of https://github.com/evanwest/CS185_Project1.git

Conflicts:
	SeatRacing/project.properties