Merge branch 'davidsBranch'
merge commit
Merge branch 'JonsBranch'

Conflicts:
	.DS_Store
Merge branch 'JonsBranch' into davidsBranch

Conflicts:
	.DS_Store
Merge branch 'JonsBranch'

Conflicts:
	.DS_Store
fuk
fuk
funny guy -> Jon
Merge branch 'davidsBranch'

Conflicts:
	.DS_Store
Merge branch 'JonsBranch'

Conflicts:

RatRace.xcodeproj/project.xcworkspace/xcuserdata/joncomo.xcuserdatad/Use
rInterfaceState.xcuserstate
Merge branch 'JonsBranch'
Merge branch 'master' into JonsBranch