placeholder
Merge branch 'master' of https://github.com/evanwest/CS185_Project1.git
placeholder to pull
Merge branch 'master' of https://github.com/evanwest/CS185_Project1.git

Conflicts:
	SeatRacing/gen/.gitignore