Mauricio-Added door open and keycard puzzle
fixed conflicts