coins
merge with master
fixed collisions and coin spawning errors.