Delayed tap
Merge branch 'master' of https://github.com/JonComo/RatRace

Conflicts:
	RatRace/RRMarketViewController.m
Merge branch 'davidsBranch'
Merge branch 'davidsBranch'

Conflicts:
	.DS_Store
Merge branch 'master' into davidsBranch