Fixed issue preventing Aaron from re-entering the bedroom

Also added fade in and fade out between both rooms