Added Circle and rectangle collision