Merge branch 'davidsBranch'

Conflicts:
	.DS_Store
Merge branch 'master' into JonsBranch

Conflicts:
	RatRace/RRMarketViewController.m